cmake

Author: aobolensk

app/Graph/CMakeLists.txt

@@ -27,21 +27,9 @@ if (NOT CMAKE_BUILD_TYPE)
 endif()
 
 if (WIN32)
-    if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
-        set(CMAKE_BUILD_TYPE "Debug")
-    endif()
-    if ("${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE")
-        set(CMAKE_BUILD_TYPE "Release")
-    endif()
-
-    set(OPENCV_BIN_SOURCE "${OPENCV_BUILD_DIR}/bin")
-    if (MSVC)
-        set(OPENCV_BIN_SOURCE "${OPENCV_BUILD_DIR}/bin/$<CONFIG>")
-    endif()
-
     add_custom_command(TARGET Graph_Build POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${OPENCV_BIN_SOURCE}"
+            "${OPENCV_BUILD_DIR}/bin/."
             "${CMAKE_BINARY_DIR}/bin/")
 
 	if ("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
@@ -52,7 +40,7 @@ if (WIN32)
 	endif()
     add_custom_command(TARGET ACC POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${OPENCV_BIN_SOURCE}"
+            "${OPENCV_BUILD_DIR}/bin/."
             "${CMAKE_BINARY_DIR}/bin/")
 endif()
 

cmake/opencv_config.cmake

@@ -1,16 +1,6 @@
 set(OPENCV_BUILD_DIR "${CMAKE_BINARY_DIR}/3rdparty/opencv_build")
 file(MAKE_DIRECTORY "${OPENCV_BUILD_DIR}")
 
-set(_opencv_bin_dir "${OPENCV_BUILD_DIR}/bin")
-file(MAKE_DIRECTORY "${_opencv_bin_dir}")
-if (WIN32)
-    foreach(_cfg Debug Release RelWithDebInfo MinSizeRel)
-        file(MAKE_DIRECTORY "${_opencv_bin_dir}/${_cfg}")
-    endforeach()
-endif()
-
-unset(_opencv_bin_dir)
-
 execute_process(
     COMMAND ${CMAKE_COMMAND} 
         -S "${CMAKE_SOURCE_DIR}/3rdparty/opencv" 

test/CMakeLists.txt

@@ -18,13 +18,9 @@ if (NOT CMAKE_BUILD_TYPE)
 endif()
 
 if (WIN32)
-    set(OPENCV_BIN_SOURCE "${OPENCV_BUILD_DIR}/bin")
-    if (MSVC)
-        set(OPENCV_BIN_SOURCE "${OPENCV_BUILD_DIR}/bin/$<CONFIG>")
-    endif()
     add_custom_command(TARGET run_test POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy_directory
-            "${OPENCV_BIN_SOURCE}"
+            "${OPENCV_BUILD_DIR}/bin/."
             "${CMAKE_BINARY_DIR}/bin/")
 
     add_custom_command(TARGET run_test POST_BUILD
@@ -38,10 +34,10 @@ if (WIN32)
             "PATH=$<TARGET_FILE_DIR:dnnl>;$<TARGET_FILE_DIR:TBB::tbb>;$ENV{PATH}"
             $<TARGET_FILE:run_test>
     )
-else()
-    add_test(UnitTests ${CMAKE_BINARY_DIR}/bin/run_test)
 endif()
 
+add_test(UnitTests ${CMAKE_BINARY_DIR}/bin/run_test)
+
 file(DOWNLOAD
     "https://raw.githubusercontent.com/opencv/opencv/4.x/samples/data/lena.jpg"
     "${CMAKE_CURRENT_BINARY_DIR}/image.jpg"