Fix MSVC external deps build

allnes · allnes · commit a8fffb090c9b · 2026-02-06T15:18:30.000Z
diff --git a/cmake/ProjectDefaults.cmake b/cmake/ProjectDefaults.cmake
@@ -55,16 +55,16 @@ function(itlabai_link_externals target_name)
                 endif()
                 if(ITLABAI_AUTOINCLUDE_EXTERNALS)
                     if(ext STREQUAL "tbb" AND DEFINED TBB_INSTALL_DIR)
-                        target_include_directories(${target_name} ${_scope} $<BUILD_INTERFACE:${TBB_INSTALL_DIR}/include>)
+                        target_include_directories(${target_name} SYSTEM ${_scope} $<BUILD_INTERFACE:${TBB_INSTALL_DIR}/include>)
                     endif()
                     if(ext STREQUAL "kokkos" AND DEFINED KOKKOS_INSTALL_DIR)
-                        target_include_directories(${target_name} ${_scope} $<BUILD_INTERFACE:${KOKKOS_INSTALL_DIR}/include>)
+                        target_include_directories(${target_name} SYSTEM ${_scope} $<BUILD_INTERFACE:${KOKKOS_INSTALL_DIR}/include>)
                     endif()
                     if(ext STREQUAL "gtest" AND DEFINED GTEST_INSTALL_DIR)
-                        target_include_directories(${target_name} ${_scope} $<BUILD_INTERFACE:${GTEST_INSTALL_DIR}/include>)
+                        target_include_directories(${target_name} SYSTEM ${_scope} $<BUILD_INTERFACE:${GTEST_INSTALL_DIR}/include>)
                     endif()
                     if(ext STREQUAL "opencv" AND DEFINED OPENCV_INSTALL_DIR)
-                        target_include_directories(${target_name} ${_scope} $<BUILD_INTERFACE:${OPENCV_INSTALL_DIR}/include/opencv4>)
+                        target_include_directories(${target_name} SYSTEM ${_scope} $<BUILD_INTERFACE:${OPENCV_INSTALL_DIR}/include/opencv4>)
                     endif()
                 endif()
             endif()
diff --git a/cmake/deps/gtest.cmake b/cmake/deps/gtest.cmake
@@ -18,6 +18,8 @@ if(NOT GTest_FOUND)
             -DBUILD_GMOCK=ON
             -DINSTALL_GTEST=ON
             -DBUILD_SHARED_LIBS=OFF
+            $<$<BOOL:${MSVC}>:-Dgtest_force_shared_crt=ON>
+            $<$<BOOL:${MSVC}>:-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL>
         BUILD_BYPRODUCTS
             ${GTEST_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
             ${GTEST_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
diff --git a/cmake/deps/kokkos.cmake b/cmake/deps/kokkos.cmake
@@ -13,6 +13,11 @@ if(NOT Kokkos_FOUND)
         set(_kokkos_openmp_flag ON)
         set(_kokkos_threads_flag OFF)
     endif()
+    if(MSVC)
+        # MSVC OpenMP is limited to 2.0; disable OpenMP for Kokkos.
+        set(_kokkos_openmp_flag OFF)
+        set(_kokkos_threads_flag ON)
+    endif()
 
     ExternalProject_Add(kokkos_external
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/kokkos"
diff --git a/cmake/deps/onednn.cmake b/cmake/deps/onednn.cmake
@@ -31,29 +31,44 @@ if(NOT dnnl_FOUND)
             -DDNNL_LIBRARY_TYPE=SHARED
             -DBUILD_SHARED_LIBS=ON
         BUILD_BYPRODUCTS
-            ${ONEDNN_INSTALL_DIR}/lib/libdnnl${CMAKE_SHARED_LIBRARY_SUFFIX}
+            ${ONEDNN_INSTALL_DIR}/lib/dnnl.lib
+            ${ONEDNN_INSTALL_DIR}/bin/dnnl.dll
     )
     add_dependencies(itlabai_external onednn_external)
 
     if(MSVC)
-        set(_dnnl_lib "${ONEDNN_INSTALL_DIR}/lib/dnnl.dll")
+        set(_dnnl_lib "${ONEDNN_INSTALL_DIR}/lib/dnnl.lib")
+        set(_dnnl_dll "${ONEDNN_INSTALL_DIR}/bin/dnnl.dll")
     else()
         set(_dnnl_lib "${ONEDNN_INSTALL_DIR}/lib/libdnnl${CMAKE_SHARED_LIBRARY_SUFFIX}")
     endif()
 
     file(MAKE_DIRECTORY "${ONEDNN_INSTALL_DIR}/include")
     file(MAKE_DIRECTORY "${ONEDNN_INSTALL_DIR}/lib")
 
-    add_library(dnnl STATIC IMPORTED GLOBAL)
-    set_target_properties(dnnl PROPERTIES
-        IMPORTED_LOCATION_RELEASE "${_dnnl_lib}"
-        IMPORTED_LOCATION_DEBUG "${_dnnl_lib}"
-        INTERFACE_INCLUDE_DIRECTORIES "${ONEDNN_INSTALL_DIR}/include"
-    )
-    set_target_properties(dnnl PROPERTIES
-        IMPORTED_LOCATION_RELWITHDEBINFO "${_dnnl_lib}"
-        IMPORTED_LOCATION_MINSIZEREL "${_dnnl_lib}"
-    )
+    add_library(dnnl SHARED IMPORTED GLOBAL)
+    if(MSVC)
+        set_target_properties(dnnl PROPERTIES
+            IMPORTED_LOCATION_RELEASE "${_dnnl_dll}"
+            IMPORTED_LOCATION_DEBUG "${_dnnl_dll}"
+            IMPORTED_LOCATION_RELWITHDEBINFO "${_dnnl_dll}"
+            IMPORTED_LOCATION_MINSIZEREL "${_dnnl_dll}"
+            IMPORTED_IMPLIB "${_dnnl_lib}"
+            IMPORTED_IMPLIB_RELEASE "${_dnnl_lib}"
+            IMPORTED_IMPLIB_DEBUG "${_dnnl_lib}"
+            IMPORTED_IMPLIB_RELWITHDEBINFO "${_dnnl_lib}"
+            IMPORTED_IMPLIB_MINSIZEREL "${_dnnl_lib}"
+            INTERFACE_INCLUDE_DIRECTORIES "${ONEDNN_INSTALL_DIR}/include"
+        )
+    else()
+        set_target_properties(dnnl PROPERTIES
+            IMPORTED_LOCATION_RELEASE "${_dnnl_lib}"
+            IMPORTED_LOCATION_DEBUG "${_dnnl_lib}"
+            IMPORTED_LOCATION_RELWITHDEBINFO "${_dnnl_lib}"
+            IMPORTED_LOCATION_MINSIZEREL "${_dnnl_lib}"
+            INTERFACE_INCLUDE_DIRECTORIES "${ONEDNN_INSTALL_DIR}/include"
+        )
+    endif()
     target_link_libraries(dnnl INTERFACE TBB::tbb)
     add_dependencies(dnnl onednn_external)
 else()
diff --git a/cmake/deps/opencv.cmake b/cmake/deps/opencv.cmake
@@ -46,42 +46,95 @@ if(NOT OpenCV_FOUND)
         -DCMAKE_CXX_STANDARD=17
     )
 
+    if(WIN32)
+        set(_opencv_ver_header "${CMAKE_SOURCE_DIR}/3rdparty/opencv/modules/core/include/opencv2/core/version.hpp")
+        if(EXISTS "${_opencv_ver_header}")
+            file(READ "${_opencv_ver_header}" _opencv_ver_text)
+            string(REGEX REPLACE ".*#define CV_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1" _opencv_ver_major "${_opencv_ver_text}")
+            string(REGEX REPLACE ".*#define CV_VERSION_MINOR[ \t]+([0-9]+).*" "\\1" _opencv_ver_minor "${_opencv_ver_text}")
+            string(REGEX REPLACE ".*#define CV_VERSION_REVISION[ \t]+([0-9]+).*" "\\1" _opencv_ver_patch "${_opencv_ver_text}")
+            set(_opencv_dllversion "${_opencv_ver_major}${_opencv_ver_minor}${_opencv_ver_patch}")
+        else()
+            set(_opencv_dllversion "")
+        endif()
+
+        if(MSVC_VERSION GREATER_EQUAL 1930)
+            set(_opencv_vc "vc17")
+        elseif(MSVC_VERSION GREATER_EQUAL 1920)
+            set(_opencv_vc "vc16")
+        else()
+            set(_opencv_vc "vc15")
+        endif()
+        set(_opencv_arch "x64")
+        set(_opencv_libdir "${OPENCV_INSTALL_DIR}/${_opencv_arch}/${_opencv_vc}/lib")
+        set(_opencv_bindir "${OPENCV_INSTALL_DIR}/${_opencv_arch}/${_opencv_vc}/bin")
+
+        set(_opencv_world_lib "${_opencv_libdir}/opencv_world${_opencv_dllversion}.lib")
+        set(_opencv_world_dll "${_opencv_bindir}/opencv_world${_opencv_dllversion}.dll")
+        set(_opencv_include_dir "${OPENCV_INSTALL_DIR}/include")
+
+        set(_opencv_byproducts
+            "${_opencv_world_lib}"
+            "${_opencv_world_dll}"
+        )
+    else()
+        set(_opencv_world "${OPENCV_INSTALL_DIR}/lib/libopencv_world${CMAKE_SHARED_LIBRARY_SUFFIX}")
+        set(_opencv_include_dir "${OPENCV_INSTALL_DIR}/include/opencv4")
+
+        set(_opencv_byproducts
+            "${_opencv_world}"
+        )
+    endif()
+
     ExternalProject_Add(opencv_external
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/opencv"
         BINARY_DIR "${OPENCV_BUILD_DIR}"
         INSTALL_DIR "${OPENCV_INSTALL_DIR}"
         CMAKE_ARGS
             -DCMAKE_INSTALL_PREFIX=${OPENCV_INSTALL_DIR}
             -DCMAKE_BUILD_TYPE=Release
+            -DOPENCV_INSTALL_BIN_DIR=bin
+            -DOPENCV_INSTALL_LIB_DIR=lib
+            -DOPENCV_INSTALL_INCLUDE_DIR=include
             -DBUILD_SHARED_LIBS=ON
             -DBUILD_PROTOBUF=ON
             -DPROTOBUF_UPDATE_FILES=OFF
             ${OPENCV_FEATURE_ARGS}
         CMAKE_CACHE_ARGS
             -DBUILD_LIST:STRING=${OPENCV_COMPONENTS_ESC}
         BUILD_BYPRODUCTS
-            ${OPENCV_INSTALL_DIR}/lib/libopencv_world${CMAKE_SHARED_LIBRARY_SUFFIX}
+            ${_opencv_byproducts}
     )
     add_dependencies(itlabai_external opencv_external)
 
-    if(MSVC)
-        set(_opencv_world "${OPENCV_INSTALL_DIR}/lib/opencv_world.lib")
-    else()
-        set(_opencv_world "${OPENCV_INSTALL_DIR}/lib/libopencv_world${CMAKE_SHARED_LIBRARY_SUFFIX}")
-    endif()
-
-    file(MAKE_DIRECTORY "${OPENCV_INSTALL_DIR}/include/opencv4")
+    file(MAKE_DIRECTORY "${_opencv_include_dir}")
     file(MAKE_DIRECTORY "${OPENCV_INSTALL_DIR}/lib")
 
     add_library(OpenCV::opencv_world SHARED IMPORTED GLOBAL)
-    set_target_properties(OpenCV::opencv_world PROPERTIES
-        IMPORTED_LOCATION "${_opencv_world}"
-        IMPORTED_LOCATION_RELEASE "${_opencv_world}"
-        IMPORTED_LOCATION_DEBUG "${_opencv_world}"
-        IMPORTED_LOCATION_RELWITHDEBINFO "${_opencv_world}"
-        IMPORTED_LOCATION_MINSIZEREL "${_opencv_world}"
-        INTERFACE_INCLUDE_DIRECTORIES "${OPENCV_INSTALL_DIR}/include/opencv4"
-    )
+    if(WIN32)
+        set_target_properties(OpenCV::opencv_world PROPERTIES
+            IMPORTED_LOCATION "${_opencv_world_dll}"
+            IMPORTED_LOCATION_RELEASE "${_opencv_world_dll}"
+            IMPORTED_LOCATION_DEBUG "${_opencv_world_dll}"
+            IMPORTED_LOCATION_RELWITHDEBINFO "${_opencv_world_dll}"
+            IMPORTED_LOCATION_MINSIZEREL "${_opencv_world_dll}"
+            IMPORTED_IMPLIB "${_opencv_world_lib}"
+            IMPORTED_IMPLIB_RELEASE "${_opencv_world_lib}"
+            IMPORTED_IMPLIB_DEBUG "${_opencv_world_lib}"
+            IMPORTED_IMPLIB_RELWITHDEBINFO "${_opencv_world_lib}"
+            IMPORTED_IMPLIB_MINSIZEREL "${_opencv_world_lib}"
+            INTERFACE_INCLUDE_DIRECTORIES "${_opencv_include_dir}"
+        )
+    else()
+        set_target_properties(OpenCV::opencv_world PROPERTIES
+            IMPORTED_LOCATION "${_opencv_world}"
+            IMPORTED_LOCATION_RELEASE "${_opencv_world}"
+            IMPORTED_LOCATION_DEBUG "${_opencv_world}"
+            IMPORTED_LOCATION_RELWITHDEBINFO "${_opencv_world}"
+            IMPORTED_LOCATION_MINSIZEREL "${_opencv_world}"
+            INTERFACE_INCLUDE_DIRECTORIES "${_opencv_include_dir}"
+        )
+    endif()
 else()
     # System OpenCV: ensure a world-like target exists
     if(NOT TARGET OpenCV::opencv_world)
diff --git a/cmake/deps/tbb.cmake b/cmake/deps/tbb.cmake
@@ -7,39 +7,81 @@ if(ITLABAI_USE_SYSTEM_DEPS)
 endif()
 
 if(NOT TBB_FOUND)
+    set(_tbb_cmake_args "")
+    if(MSVC)
+        list(APPEND _tbb_cmake_args
+            -DCMAKE_C_COMPILER=cl
+            -DCMAKE_CXX_COMPILER=cl
+        )
+    elseif(WIN32)
+        get_filename_component(_clang_dir "${CMAKE_C_COMPILER}" DIRECTORY)
+        set(_clang_cl "${_clang_dir}/clang-cl.exe")
+        if(EXISTS "${_clang_cl}")
+            list(APPEND _tbb_cmake_args
+                -DCMAKE_C_COMPILER=${_clang_cl}
+                -DCMAKE_CXX_COMPILER=${_clang_cl}
+            )
+        endif()
+    endif()
+
+    if(WIN32)
+        set(_tbb_lib_name "tbb12")
+        set(_tbb_lib "${TBB_INSTALL_DIR}/lib/${_tbb_lib_name}.lib")
+        set(_tbb_dll "${TBB_INSTALL_DIR}/bin/${_tbb_lib_name}.dll")
+        set(_tbb_byproducts
+            "${_tbb_lib}"
+            "${_tbb_dll}"
+        )
+    else()
+        set(_tbb_byproducts
+            "${TBB_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tbb${CMAKE_SHARED_LIBRARY_SUFFIX}"
+        )
+        set(_tbb_lib "${TBB_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}tbb${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    endif()
+
     ExternalProject_Add(tbb_external
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/TBB"
         BINARY_DIR "${TBB_BUILD_DIR}"
         INSTALL_DIR "${TBB_INSTALL_DIR}"
         CMAKE_ARGS
             -DCMAKE_INSTALL_PREFIX=${TBB_INSTALL_DIR}
             -DCMAKE_BUILD_TYPE=Release
-            -DBUILD_SHARED_LIBS=OFF
+            -DBUILD_SHARED_LIBS=ON
             -DTBB_TEST=OFF
             -DTBB_EXAMPLES=OFF
             -DTBB_STRICT=OFF
+            ${_tbb_cmake_args}
         BUILD_BYPRODUCTS
-            ${TBB_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}tbb${CMAKE_STATIC_LIBRARY_SUFFIX}
+            ${_tbb_byproducts}
     )
     add_dependencies(itlabai_external tbb_external)
 
-    if(MSVC)
-        set(_tbb_lib "${TBB_INSTALL_DIR}/lib/tbb_static.lib")
-    else()
-        set(_tbb_lib "${TBB_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}tbb${CMAKE_STATIC_LIBRARY_SUFFIX}")
-    endif()
-
     file(MAKE_DIRECTORY "${TBB_INSTALL_DIR}/include")
     file(MAKE_DIRECTORY "${TBB_INSTALL_DIR}/lib")
 
-    add_library(TBB::tbb STATIC IMPORTED GLOBAL)
-    set_target_properties(TBB::tbb PROPERTIES
-        IMPORTED_LOCATION_RELEASE "${_tbb_lib}"
-        IMPORTED_LOCATION_DEBUG "${_tbb_lib}"
-        IMPORTED_LOCATION_RELWITHDEBINFO "${_tbb_lib}"
-        IMPORTED_LOCATION_MINSIZEREL "${_tbb_lib}"
-        INTERFACE_INCLUDE_DIRECTORIES "${TBB_INSTALL_DIR}/include"
-    )
+    add_library(TBB::tbb SHARED IMPORTED GLOBAL)
+    if(WIN32)
+        set_target_properties(TBB::tbb PROPERTIES
+            IMPORTED_LOCATION_RELEASE "${_tbb_dll}"
+            IMPORTED_LOCATION_DEBUG "${_tbb_dll}"
+            IMPORTED_LOCATION_RELWITHDEBINFO "${_tbb_dll}"
+            IMPORTED_LOCATION_MINSIZEREL "${_tbb_dll}"
+            IMPORTED_IMPLIB "${_tbb_lib}"
+            IMPORTED_IMPLIB_RELEASE "${_tbb_lib}"
+            IMPORTED_IMPLIB_DEBUG "${_tbb_lib}"
+            IMPORTED_IMPLIB_RELWITHDEBINFO "${_tbb_lib}"
+            IMPORTED_IMPLIB_MINSIZEREL "${_tbb_lib}"
+            INTERFACE_INCLUDE_DIRECTORIES "${TBB_INSTALL_DIR}/include"
+        )
+    else()
+        set_target_properties(TBB::tbb PROPERTIES
+            IMPORTED_LOCATION_RELEASE "${_tbb_lib}"
+            IMPORTED_LOCATION_DEBUG "${_tbb_lib}"
+            IMPORTED_LOCATION_RELWITHDEBINFO "${_tbb_lib}"
+            IMPORTED_LOCATION_MINSIZEREL "${_tbb_lib}"
+            INTERFACE_INCLUDE_DIRECTORIES "${TBB_INSTALL_DIR}/include"
+        )
+    endif()
     add_dependencies(TBB::tbb tbb_external)
 else()
     # Use system-provided TBB target
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -55,6 +55,7 @@ target_include_directories(run_test PRIVATE "${CMAKE_SOURCE_DIR}/app/ReaderImage
 itlabai_target_defaults(run_test)
 
 if (WIN32)
+    target_compile_definitions(run_test PRIVATE _CRT_SECURE_NO_WARNINGS)
     add_custom_command(TARGET run_test POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy
             $<TARGET_FILE:dnnl>
