]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/3rdparty/libtiff/CMakeLists.txt b/3rdparty/libtiff/CMakeLists.txt |
2 | index b0e076f..3f7ade1 100644 | |
3 | --- a/3rdparty/libtiff/CMakeLists.txt | |
4 | +++ b/3rdparty/libtiff/CMakeLists.txt | |
5 | @@ -102,7 +102,7 @@ if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR CV_ICC)) | |
6 | endif() | |
7 | ||
8 | add_library(${TIFF_LIBRARY} STATIC ${lib_srcs}) | |
9 | -target_link_libraries(${TIFF_LIBRARY} ${ZLIB_LIBRARIES}) | |
10 | +target_link_libraries(${TIFF_LIBRARY} ZLIB::ZLIB) | |
11 | ||
12 | set_target_properties(${TIFF_LIBRARY} | |
13 | PROPERTIES | |
14 | diff --git a/3rdparty/openexr/CMakeLists.txt b/3rdparty/openexr/CMakeLists.txt | |
15 | index 9387616..54ecc1a 100644 | |
16 | --- a/3rdparty/openexr/CMakeLists.txt | |
17 | +++ b/3rdparty/openexr/CMakeLists.txt | |
18 | @@ -55,7 +55,7 @@ if(MSVC AND CV_ICC) | |
19 | endif() | |
20 | ||
21 | add_library(IlmImf STATIC ${lib_hdrs} ${lib_srcs}) | |
22 | -target_link_libraries(IlmImf ${ZLIB_LIBRARIES}) | |
23 | +target_link_libraries(IlmImf ZLIB::ZLIB) | |
24 | ||
25 | set_target_properties(IlmImf | |
26 | PROPERTIES | |
27 | diff --git a/3rdparty/tbb/CMakeLists.txt b/3rdparty/tbb/CMakeLists.txt | |
28 | index fd8ef32..fe571a2 100644 | |
29 | --- a/3rdparty/tbb/CMakeLists.txt | |
30 | +++ b/3rdparty/tbb/CMakeLists.txt | |
31 | @@ -116,7 +116,7 @@ endif() | |
32 | ||
33 | if(NOT EXISTS "${tbb_tarball}") | |
34 | message(STATUS "Downloading ${tbb_ver}_src.tgz") | |
35 | - file(DOWNLOAD "${tbb_url}" "${tbb_tarball}" TIMEOUT 600 STATUS __statvar) | |
36 | + message(FATAL_ERROR " Downloads are not permitted during configure. Please pre-download the file \"${CACHE_CANDIDATE}\":\n \n vcpkg_download_distfile(OCV_DOWNLOAD\n URLS \"${tbb_url}\"\n FILENAME \"${tbb_tarball}\"\n SHA512 0\n )") | |
37 | if(NOT __statvar EQUAL 0) | |
38 | message(FATAL_ERROR "Failed to download TBB sources (${__statvar}): ${tbb_url}") | |
39 | endif() | |
40 | diff --git a/CMakeLists.txt b/CMakeLists.txt | |
41 | index 90e16c2..6601820 100644 | |
42 | --- a/CMakeLists.txt | |
43 | +++ b/CMakeLists.txt | |
44 | @@ -275,23 +275,10 @@ if (ANDROID) | |
45 | endif() | |
46 | ||
47 | if(NOT DEFINED OPENCV_DOC_INSTALL_PATH) | |
48 | - if(ANDROID OR WIN32) | |
49 | - set(OPENCV_DOC_INSTALL_PATH doc) | |
50 | - elseif(INSTALL_TO_MANGLED_PATHS) | |
51 | - set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc) | |
52 | - else() | |
53 | - set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc) | |
54 | - endif() | |
55 | + set(OPENCV_DOC_INSTALL_PATH share/opencv/doc) | |
56 | endif() | |
57 | ||
58 | -if(WIN32) | |
59 | - if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH) | |
60 | - set(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/") | |
61 | - else() | |
62 | - message(STATUS "Can't detect runtime and/or arch") | |
63 | - set(OpenCV_INSTALL_BINARIES_PREFIX "") | |
64 | - endif() | |
65 | -elseif(ANDROID) | |
66 | +if(ANDROID) | |
67 | set(OpenCV_INSTALL_BINARIES_PREFIX "sdk/native/") | |
68 | else() | |
69 | set(OpenCV_INSTALL_BINARIES_PREFIX "") | |
70 | @@ -322,29 +309,13 @@ if(ANDROID) | |
71 | set(OPENCV_INCLUDE_INSTALL_PATH sdk/native/jni/include) | |
72 | set(OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native) | |
73 | else() | |
74 | - set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib") | |
75 | - set(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}") | |
76 | - if(WIN32) | |
77 | - if(OpenCV_STATIC) | |
78 | - set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") | |
79 | - else() | |
80 | - set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib${LIB_SUFFIX}") | |
81 | - endif() | |
82 | - set(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") | |
83 | - set(OPENCV_SAMPLES_SRC_INSTALL_PATH samples/native) | |
84 | - else() | |
85 | - set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX}) | |
86 | - set(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}) | |
87 | - set(OPENCV_SAMPLES_SRC_INSTALL_PATH share/OpenCV/samples) | |
88 | - endif() | |
89 | - set(OPENCV_INCLUDE_INSTALL_PATH "include") | |
90 | - | |
91 | - math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}") | |
92 | - if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX) | |
93 | - set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv) | |
94 | - else() | |
95 | - set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV) | |
96 | - endif() | |
97 | + set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib") | |
98 | + set(3P_LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}") | |
99 | + set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}lib") | |
100 | + set(OPENCV_3P_LIB_INSTALL_PATH "${OPENCV_LIB_INSTALL_PATH}") | |
101 | + set(OPENCV_SAMPLES_SRC_INSTALL_PATH "share/opencv/samples") | |
102 | + set(OPENCV_INCLUDE_INSTALL_PATH "include") | |
103 | + set(OPENCV_CONFIG_INSTALL_PATH "share/opencv") | |
104 | endif() | |
105 | ||
106 | set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OPENCV_LIB_INSTALL_PATH}") | |
107 | @@ -356,7 +327,7 @@ endif() | |
108 | ||
109 | if(WIN32) | |
110 | # Postfix of DLLs: | |
111 | - set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}") | |
112 | + set(OPENCV_DLLVERSION "") | |
113 | set(OPENCV_DEBUG_POSTFIX d) | |
114 | else() | |
115 | # Postfix of so's: | |
116 | @@ -397,8 +368,6 @@ if(CMAKE_HOST_WIN32) | |
117 | endif() | |
118 | endif() | |
119 | ||
120 | -find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client") | |
121 | -mark_as_advanced(GIT_EXECUTABLE) | |
122 | ||
123 | if(GIT_EXECUTABLE) | |
124 | execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*" | |
125 | @@ -501,7 +470,6 @@ if(BUILD_DOCS) | |
126 | endif(BUILD_DOCS) | |
127 | ||
128 | # --- Python Support --- | |
129 | -include(cmake/OpenCVDetectPython.cmake) | |
130 | ||
131 | # --- Java Support --- | |
132 | include(cmake/OpenCVDetectApacheAnt.cmake) | |
133 | @@ -885,11 +853,7 @@ if(ANDROID) | |
134 | endif() | |
135 | ||
136 | if(DEFINED WITH_FFMPEG OR HAVE_FFMPEG) | |
137 | - if(WIN32) | |
138 | - status(" FFMPEG:" WITH_FFMPEG THEN "YES (prebuilt binaries)" ELSE NO) | |
139 | - else() | |
140 | status(" FFMPEG:" HAVE_FFMPEG THEN YES ELSE NO) | |
141 | - endif() | |
142 | status(" avcodec:" FFMPEG_libavcodec_FOUND THEN "YES (ver ${FFMPEG_libavcodec_VERSION})" ELSE NO) | |
143 | status(" avformat:" FFMPEG_libavformat_FOUND THEN "YES (ver ${FFMPEG_libavformat_VERSION})" ELSE NO) | |
144 | status(" avutil:" FFMPEG_libavutil_FOUND THEN "YES (ver ${FFMPEG_libavutil_VERSION})" ELSE NO) | |
145 | diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake | |
146 | index e61059a..ec6f34f 100644 | |
147 | --- a/cmake/OpenCVCompilerOptions.cmake | |
148 | +++ b/cmake/OpenCVCompilerOptions.cmake | |
149 | @@ -269,7 +269,6 @@ if(MSVC) | |
150 | set(OPENCV_EXTRA_FLAGS "${OPENCV_EXTRA_FLAGS} /bigobj") | |
151 | endif() | |
152 | if(BUILD_WITH_DEBUG_INFO) | |
153 | - set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") | |
154 | endif() | |
155 | ||
156 | if(ENABLE_SSE4_1 AND CV_ICC AND NOT OPENCV_EXTRA_FLAGS MATCHES "/arch:") | |
157 | diff --git a/cmake/OpenCVFindLibsVideo.cmake b/cmake/OpenCVFindLibsVideo.cmake | |
158 | index 146043f..1202225 100644 | |
159 | --- a/cmake/OpenCVFindLibsVideo.cmake | |
160 | +++ b/cmake/OpenCVFindLibsVideo.cmake | |
161 | @@ -185,12 +185,8 @@ endif(WITH_XIMEA) | |
162 | # --- FFMPEG --- | |
163 | ocv_clear_vars(HAVE_FFMPEG) | |
164 | if(WITH_FFMPEG) | |
165 | - if(WIN32 AND NOT ARM) | |
166 | - include("${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/ffmpeg_version.cmake") | |
167 | + find_package(FFMPEG REQUIRED) | |
168 | set(HAVE_FFMPEG TRUE) | |
169 | - elseif(PKG_CONFIG_FOUND) | |
170 | - ocv_check_modules(FFMPEG libavcodec libavformat libavutil libswscale) | |
171 | - ocv_check_modules(FFMPEG_libavresample libavresample) | |
172 | if(FFMPEG_libavresample_FOUND) | |
173 | ocv_append_build_options(FFMPEG FFMPEG_libavresample) | |
174 | endif() | |
175 | @@ -211,9 +207,6 @@ if(WITH_FFMPEG) | |
176 | ocv_append_build_options(HIGHGUI FFMPEG) | |
177 | endif() | |
178 | endif() | |
179 | - else() | |
180 | - message(STATUS "Can't find ffmpeg - 'pkg-config' utility is missing") | |
181 | - endif() | |
182 | endif(WITH_FFMPEG) | |
183 | ||
184 | # --- VideoInput/DirectShow --- | |
185 | diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake | |
186 | index dacfbb1..3760866 100644 | |
187 | --- a/cmake/OpenCVGenConfig.cmake | |
188 | +++ b/cmake/OpenCVGenConfig.cmake | |
189 | @@ -101,7 +101,7 @@ endif() | |
190 | configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig.cmake" @ONLY) | |
191 | configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCVConfig-version.cmake.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCVConfig-version.cmake" @ONLY) | |
192 | ||
193 | -if(UNIX) # ANDROID configuration is created here also | |
194 | +if(1) # ANDROID configuration is created here also | |
195 | #http://www.vtk.org/Wiki/CMake/Tutorials/Packaging reference | |
196 | # For a command "find_package(<name> [major[.minor]] [EXACT] [REQUIRED|QUIET])" | |
197 | # cmake will look in the following dir on unix: | |
198 | @@ -126,7 +126,7 @@ endif() | |
199 | # -------------------------------------------------------------------------------------------- | |
200 | # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages | |
201 | # -------------------------------------------------------------------------------------------- | |
202 | -if(WIN32) | |
203 | +if(0) | |
204 | set(OpenCV_INCLUDE_DIRS_CONFIGCMAKE "\"\${OpenCV_CONFIG_PATH}/include\" \"\${OpenCV_CONFIG_PATH}/include/opencv\"") | |
205 | set(OpenCV2_INCLUDE_DIRS_CONFIGCMAKE "\"\"") | |
206 | ||
207 | diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake | |
208 | index 6f9fb0b..56f8879 100644 | |
209 | --- a/cmake/OpenCVModule.cmake | |
210 | +++ b/cmake/OpenCVModule.cmake | |
211 | @@ -86,10 +86,10 @@ macro(ocv_add_dependencies full_modname) | |
212 | endforeach() | |
213 | unset(__depsvar) | |
214 | ||
215 | - ocv_list_unique(OPENCV_MODULE_${full_modname}_REQ_DEPS) | |
216 | - ocv_list_unique(OPENCV_MODULE_${full_modname}_OPT_DEPS) | |
217 | - ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_REQ_DEPS) | |
218 | - ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_OPT_DEPS) | |
219 | + #ocv_list_unique(OPENCV_MODULE_${full_modname}_REQ_DEPS) | |
220 | + #ocv_list_unique(OPENCV_MODULE_${full_modname}_OPT_DEPS) | |
221 | + #ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_REQ_DEPS) | |
222 | + #ocv_list_unique(OPENCV_MODULE_${full_modname}_PRIVATE_OPT_DEPS) | |
223 | ||
224 | set(OPENCV_MODULE_${full_modname}_REQ_DEPS ${OPENCV_MODULE_${full_modname}_REQ_DEPS} | |
225 | CACHE INTERNAL "Required dependencies of ${full_modname} module") | |
226 | @@ -277,7 +277,7 @@ endfunction() | |
227 | ||
228 | # sort modules by dependencies | |
229 | function(__ocv_sort_modules_by_deps __lst) | |
230 | - ocv_list_sort(${__lst}) | |
231 | + #ocv_list_sort(${__lst}) | |
232 | set(${__lst}_ORDERED ${${__lst}} CACHE INTERNAL "") | |
233 | set(__result "") | |
234 | foreach (m ${${__lst}}) | |
235 | @@ -382,7 +382,7 @@ function(__ocv_resolve_dependencies) | |
236 | endforeach() | |
237 | endforeach() | |
238 | ||
239 | - ocv_list_sort(OPENCV_MODULES_BUILD) | |
240 | + #ocv_list_sort(OPENCV_MODULES_BUILD) | |
241 | ||
242 | foreach(m ${OPENCV_MODULES_BUILD}) | |
243 | # message(STATUS "FULL deps of ${m}: ${deps_${m}}") | |
244 | @@ -397,7 +397,7 @@ function(__ocv_resolve_dependencies) | |
245 | # reorder dependencies | |
246 | foreach(m ${OPENCV_MODULES_BUILD}) | |
247 | __ocv_sort_modules_by_deps(OPENCV_MODULE_${m}_DEPS) | |
248 | - ocv_list_sort(OPENCV_MODULE_${m}_DEPS_EXT) | |
249 | + #ocv_list_sort(OPENCV_MODULE_${m}_DEPS_EXT) | |
250 | ||
251 | set(OPENCV_MODULE_${m}_DEPS ${OPENCV_MODULE_${m}_DEPS} CACHE INTERNAL "Flattened dependencies of ${m} module") | |
252 | set(OPENCV_MODULE_${m}_DEPS_EXT ${OPENCV_MODULE_${m}_DEPS_EXT} CACHE INTERNAL "Extra dependencies of ${m} module") | |
253 | diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt | |
254 | index e3177bd..f902b2b 100644 | |
255 | --- a/data/CMakeLists.txt | |
256 | +++ b/data/CMakeLists.txt | |
257 | @@ -5,8 +5,6 @@ if(ANDROID) | |
258 | install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT libs) | |
259 | install(FILES ${LBP_CASCADES} DESTINATION sdk/etc/lbpcascades COMPONENT libs) | |
260 | else() | |
261 | - install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT libs) | |
262 | - install(FILES ${LBP_CASCADES} DESTINATION share/OpenCV/lbpcascades COMPONENT libs) | |
263 | endif() | |
264 | ||
265 | if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) | |
266 | @@ -51,4 +49,4 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) | |
267 | install(FILES ${DATAFILES_CASCADES} DESTINATION share/OpenCV/testdata/data/haarcascades COMPONENT tests) | |
268 | endif() | |
269 | endif() | |
270 | -endif() | |
271 | \ No newline at end of file | |
272 | +endif() | |
273 | diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt | |
274 | index d9de52d..be604dc 100644 | |
275 | --- a/modules/core/CMakeLists.txt | |
276 | +++ b/modules/core/CMakeLists.txt | |
277 | @@ -1,9 +1,9 @@ | |
278 | set(the_description "The Core Functionality") | |
279 | ||
280 | if (NOT HAVE_CUDA OR ENABLE_DYNAMIC_CUDA) | |
281 | - ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES}) | |
282 | + ocv_add_module(core PRIVATE_REQUIRED ZLIB::ZLIB) | |
283 | else() | |
284 | - ocv_add_module(core PRIVATE_REQUIRED ${ZLIB_LIBRARIES} ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY}) | |
285 | + ocv_add_module(core PRIVATE_REQUIRED ZLIB::ZLIB ${CUDA_LIBRARIES} ${CUDA_npp_LIBRARY}) | |
286 | endif() | |
287 | ||
288 | ocv_module_include_directories("${OpenCV_SOURCE_DIR}/modules/dynamicuda/include/" ${ZLIB_INCLUDE_DIR}) | |
289 | diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt | |
290 | index d59e95a..ce7f87b 100644 | |
291 | --- a/modules/highgui/CMakeLists.txt | |
292 | +++ b/modules/highgui/CMakeLists.txt | |
293 | @@ -15,23 +15,23 @@ endif() | |
294 | ||
295 | if(HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR) | |
296 | ocv_include_directories(${ZLIB_INCLUDE_DIR}) | |
297 | - list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES}) | |
298 | + list(APPEND GRFMT_LIBS ZLIB::ZLIB) | |
299 | endif() | |
300 | ||
301 | if(HAVE_JPEG) | |
302 | ocv_include_directories(${JPEG_INCLUDE_DIR}) | |
303 | - list(APPEND GRFMT_LIBS ${JPEG_LIBRARIES}) | |
304 | + list(APPEND GRFMT_LIBS JPEG::JPEG) | |
305 | endif() | |
306 | ||
307 | if(HAVE_PNG) | |
308 | add_definitions(${PNG_DEFINITIONS}) | |
309 | ocv_include_directories(${PNG_INCLUDE_DIR}) | |
310 | - list(APPEND GRFMT_LIBS ${PNG_LIBRARIES}) | |
311 | + list(APPEND GRFMT_LIBS PNG::PNG) | |
312 | endif() | |
313 | ||
314 | if(HAVE_TIFF) | |
315 | ocv_include_directories(${TIFF_INCLUDE_DIR}) | |
316 | - list(APPEND GRFMT_LIBS ${TIFF_LIBRARIES}) | |
317 | + list(APPEND GRFMT_LIBS TIFF::TIFF) | |
318 | endif() | |
319 | ||
320 | if(HAVE_JASPER) | |
321 | @@ -296,38 +296,5 @@ endif() | |
322 | ocv_add_precompiled_headers(${the_module}) | |
323 | ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-deprecated-declarations -Wno-clobbered) | |
324 | ||
325 | -if(WIN32 AND WITH_FFMPEG) | |
326 | - #copy ffmpeg dll to the output folder | |
327 | - if(MSVC64 OR MINGW64) | |
328 | - set(FFMPEG_SUFFIX _64) | |
329 | - endif() | |
330 | - | |
331 | - set(ffmpeg_bare_name "opencv_ffmpeg${FFMPEG_SUFFIX}.dll") | |
332 | - set(ffmpeg_bare_name_ver "opencv_ffmpeg${OPENCV_DLLVERSION}${FFMPEG_SUFFIX}.dll") | |
333 | - set(ffmpeg_path "${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/${ffmpeg_bare_name}") | |
334 | - | |
335 | - #if(MSVC AND CMAKE_VERSION VERSION_GREATER "2.8.2") | |
336 | - # add_custom_command(TARGET ${the_module} POST_BUILD | |
337 | - # COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/$<CONFIGURATION>/${ffmpeg_bare_name_ver}" | |
338 | - # COMMENT "Copying ${ffmpeg_path} to the output directory") | |
339 | - #else | |
340 | - if(MSVC_IDE) | |
341 | - add_custom_command(TARGET ${the_module} POST_BUILD | |
342 | - COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/Release/${ffmpeg_bare_name_ver}" | |
343 | - COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/Debug/${ffmpeg_bare_name_ver}" | |
344 | - COMMENT "Copying ${ffmpeg_path} to the output directory") | |
345 | - elseif(MSVC AND (CMAKE_GENERATOR MATCHES "Visual")) | |
346 | - add_custom_command(TARGET ${the_module} POST_BUILD | |
347 | - COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/${ffmpeg_bare_name_ver}" | |
348 | - COMMENT "Copying ${ffmpeg_path} to the output directory") | |
349 | - else() | |
350 | - add_custom_command(TARGET ${the_module} POST_BUILD | |
351 | - COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/${ffmpeg_bare_name_ver}" | |
352 | - COMMENT "Copying ${ffmpeg_path} to the output directory") | |
353 | - endif() | |
354 | - | |
355 | - install(FILES "${ffmpeg_path}" DESTINATION ${OPENCV_BIN_INSTALL_PATH} COMPONENT libs RENAME "${ffmpeg_bare_name_ver}") | |
356 | -endif() | |
357 | - | |
358 | ocv_add_accuracy_tests() | |
359 | ocv_add_perf_tests() |