Make presets compiler-agnostic and align external deps

allnes · allnes · commit 2017fa3aae0f · 2026-02-06T16:59:10.000Z
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,16 +62,17 @@ if(ITLABAI_FETCH_TEST_DATA)
     )
 endif()
 
-if(NOT WIN32)
+if(CMAKE_CONFIGURATION_TYPES)
+    foreach(cfg IN LISTS CMAKE_CONFIGURATION_TYPES)
+        string(TOUPPER "${cfg}" cfg_upper)
+        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${cfg_upper} "${CMAKE_BINARY_DIR}/lib")
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${cfg_upper} "${CMAKE_BINARY_DIR}/lib")
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${cfg_upper} "${CMAKE_BINARY_DIR}/bin")
+    endforeach()
+else()
     set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
-else()
-    foreach(CONFIG "" _DEBUG _RELEASE)
-        set("CMAKE_ARCHIVE_OUTPUT_DIRECTORY${CONFIG}" "${CMAKE_BINARY_DIR}/lib")
-        set("CMAKE_LIBRARY_OUTPUT_DIRECTORY${CONFIG}" "${CMAKE_BINARY_DIR}/lib")
-        set("CMAKE_RUNTIME_OUTPUT_DIRECTORY${CONFIG}" "${CMAKE_BINARY_DIR}/bin")
-    endforeach()
 endif()
 
 # RPATH for bundled externals
diff --git a/cmake/ProjectDefaults.cmake b/cmake/ProjectDefaults.cmake
@@ -53,6 +53,10 @@ function(itlabai_link_externals target_name)
                 if(TARGET ${ext}_external)
                     add_dependencies(${target_name} ${ext}_external)
                 endif()
+                if(ext STREQUAL "kokkos" AND MSVC)
+                    # Suppress Kokkos header warning C4702 only on targets that use Kokkos.
+                    target_compile_options(${target_name} ${_scope} /wd4702)
+                endif()
                 if(ITLABAI_AUTOINCLUDE_EXTERNALS)
                     if(ext STREQUAL "tbb" AND DEFINED TBB_INSTALL_DIR)
                         target_include_directories(${target_name} SYSTEM ${_scope} $<BUILD_INTERFACE:${TBB_INSTALL_DIR}/include>)
@@ -64,7 +68,17 @@ function(itlabai_link_externals target_name)
                         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} SYSTEM ${_scope} $<BUILD_INTERFACE:${OPENCV_INSTALL_DIR}/include/opencv4>)
+                        set(_opencv_inc "")
+                        if(DEFINED OPENCV_INCLUDE_DIR AND NOT OPENCV_INCLUDE_DIR STREQUAL "")
+                            set(_opencv_inc "${OPENCV_INCLUDE_DIR}")
+                        elseif(WIN32)
+                            set(_opencv_inc "${OPENCV_INSTALL_DIR}/include")
+                        else()
+                            set(_opencv_inc "${OPENCV_INSTALL_DIR}/include/opencv4")
+                        endif()
+                        if(_opencv_inc)
+                            target_include_directories(${target_name} SYSTEM ${_scope} $<BUILD_INTERFACE:${_opencv_inc}>)
+                        endif()
                     endif()
                 endif()
             endif()
diff --git a/cmake/deps.cmake b/cmake/deps.cmake
@@ -5,6 +5,26 @@ set(ITLABAI_EXTERNAL_ROOT "${CMAKE_BINARY_DIR}/_external" CACHE PATH "Root for e
 set(ITLABAI_EXTERNAL_BUILD_ROOT "${ITLABAI_EXTERNAL_ROOT}/build" CACHE PATH "External build trees")
 set(ITLABAI_EXTERNAL_INSTALL_ROOT "${ITLABAI_EXTERNAL_ROOT}/install" CACHE PATH "External install trees")
 
+set(ITLABAI_EXTERNAL_TOOLCHAIN_ARGS "")
+set(_itlabai_cc "")
+set(_itlabai_cxx "")
+if(DEFINED CMAKE_C_COMPILER AND NOT CMAKE_C_COMPILER STREQUAL "")
+    set(_itlabai_cc "${CMAKE_C_COMPILER}")
+elseif(DEFINED ENV{CC} AND NOT "$ENV{CC}" STREQUAL "")
+    set(_itlabai_cc "$ENV{CC}")
+endif()
+if(DEFINED CMAKE_CXX_COMPILER AND NOT CMAKE_CXX_COMPILER STREQUAL "")
+    set(_itlabai_cxx "${CMAKE_CXX_COMPILER}")
+elseif(DEFINED ENV{CXX} AND NOT "$ENV{CXX}" STREQUAL "")
+    set(_itlabai_cxx "$ENV{CXX}")
+endif()
+if(_itlabai_cc)
+    list(APPEND ITLABAI_EXTERNAL_TOOLCHAIN_ARGS -DCMAKE_C_COMPILER=${_itlabai_cc})
+endif()
+if(_itlabai_cxx)
+    list(APPEND ITLABAI_EXTERNAL_TOOLCHAIN_ARGS -DCMAKE_CXX_COMPILER=${_itlabai_cxx})
+endif()
+
 add_custom_target(itlabai_external) # aggregator for externals
 
 include(${CMAKE_CURRENT_LIST_DIR}/deps/tbb.cmake)
diff --git a/cmake/deps/gtest.cmake b/cmake/deps/gtest.cmake
@@ -8,18 +8,33 @@ endif()
 
 if(NOT GTest_FOUND)
     find_package(Threads REQUIRED)
+    set(_gtest_build_type "${CMAKE_BUILD_TYPE}")
+    if(NOT _gtest_build_type)
+        set(_gtest_build_type "Release")
+    endif()
+    set(_gtest_cmake_args "")
+    if(MSVC)
+        set(_gtest_msvc_runtime "MultiThreadedDLL")
+        if(_gtest_build_type STREQUAL "Debug")
+            set(_gtest_msvc_runtime "MultiThreadedDebugDLL")
+        endif()
+        list(APPEND _gtest_cmake_args
+            -Dgtest_force_shared_crt=ON
+            -DCMAKE_MSVC_RUNTIME_LIBRARY=${_gtest_msvc_runtime}
+        )
+    endif()
     ExternalProject_Add(gtest_external
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/googletest"
         BINARY_DIR "${GTEST_BUILD_DIR}"
         INSTALL_DIR "${GTEST_INSTALL_DIR}"
         CMAKE_ARGS
             -DCMAKE_INSTALL_PREFIX=${GTEST_INSTALL_DIR}
-            -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_BUILD_TYPE=${_gtest_build_type}
             -DBUILD_GMOCK=ON
             -DINSTALL_GTEST=ON
             -DBUILD_SHARED_LIBS=OFF
-            $<$<BOOL:${MSVC}>:-Dgtest_force_shared_crt=ON>
-            $<$<BOOL:${MSVC}>:-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL>
+            ${_gtest_cmake_args}
+            ${ITLABAI_EXTERNAL_TOOLCHAIN_ARGS}
         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
@@ -7,6 +7,10 @@ if(ITLABAI_USE_SYSTEM_DEPS)
 endif()
 
 if(NOT Kokkos_FOUND)
+    set(_kokkos_build_type "${CMAKE_BUILD_TYPE}")
+    if(NOT _kokkos_build_type)
+        set(_kokkos_build_type "Release")
+    endif()
     set(_kokkos_openmp_flag OFF)
     set(_kokkos_threads_flag ON)
     if(ITLABAI_ENABLE_OPENMP AND OpenMP_FOUND AND NOT (APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
@@ -25,7 +29,7 @@ if(NOT Kokkos_FOUND)
         INSTALL_DIR "${KOKKOS_INSTALL_DIR}"
         CMAKE_ARGS
             -DCMAKE_INSTALL_PREFIX=${KOKKOS_INSTALL_DIR}
-            -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_BUILD_TYPE=${_kokkos_build_type}
             -DKokkos_ENABLE_SERIAL=ON
             -DKokkos_ENABLE_THREADS=${_kokkos_threads_flag}
             -DKokkos_ENABLE_OPENMP=${_kokkos_openmp_flag}
@@ -34,6 +38,7 @@ if(NOT Kokkos_FOUND)
             -DKokkos_ENABLE_TESTS=OFF
             -DKokkos_ENABLE_EXAMPLES=OFF
             -DBUILD_SHARED_LIBS=OFF
+            ${ITLABAI_EXTERNAL_TOOLCHAIN_ARGS}
         BUILD_BYPRODUCTS
             ${KOKKOS_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}kokkoscore${CMAKE_STATIC_LIBRARY_SUFFIX}
             ${KOKKOS_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}kokkoscontainers${CMAKE_STATIC_LIBRARY_SUFFIX}
diff --git a/cmake/deps/onednn.cmake b/cmake/deps/onednn.cmake
@@ -7,6 +7,10 @@ if(ITLABAI_USE_SYSTEM_DEPS)
 endif()
 
 if(NOT dnnl_FOUND)
+    set(_onednn_build_type "${CMAKE_BUILD_TYPE}")
+    if(NOT _onednn_build_type)
+        set(_onednn_build_type "Release")
+    endif()
     set(_onednn_depends "")
     if(TARGET tbb_external)
         set(_onednn_depends tbb_external)
@@ -19,7 +23,7 @@ if(NOT dnnl_FOUND)
         DEPENDS ${_onednn_depends}
         CMAKE_ARGS
             -DCMAKE_INSTALL_PREFIX=${ONEDNN_INSTALL_DIR}
-            -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_BUILD_TYPE=${_onednn_build_type}
             -DDNNL_BUILD_TESTS=OFF
             -DDNNL_BUILD_EXAMPLES=OFF
             -DDNNL_BUILD_DOC=OFF
@@ -30,6 +34,7 @@ if(NOT dnnl_FOUND)
             -DTBB_ROOT=${TBB_INSTALL_DIR}
             -DDNNL_LIBRARY_TYPE=SHARED
             -DBUILD_SHARED_LIBS=ON
+            ${ITLABAI_EXTERNAL_TOOLCHAIN_ARGS}
         BUILD_BYPRODUCTS
             ${ONEDNN_INSTALL_DIR}/lib/dnnl.lib
             ${ONEDNN_INSTALL_DIR}/bin/dnnl.dll
diff --git a/cmake/deps/opencv.cmake b/cmake/deps/opencv.cmake
@@ -2,12 +2,19 @@ set(OPENCV_PREFIX "${ITLABAI_EXTERNAL_ROOT}/opencv")
 set(OPENCV_BUILD_DIR "${ITLABAI_EXTERNAL_BUILD_ROOT}/opencv_min")
 set(OPENCV_INSTALL_DIR "${ITLABAI_EXTERNAL_INSTALL_ROOT}/opencv_min")
 
-# Always build local OpenCV (no system fallback for reproducibility)
+set(OPENCV_COMPONENTS core imgproc imgcodecs highgui world)
+set(OPENCV_COMPONENTS_ESC "core\\;imgproc\\;imgcodecs\\;highgui\\;world")
+
 set(OpenCV_FOUND FALSE)
+if(ITLABAI_USE_SYSTEM_DEPS)
+    find_package(OpenCV QUIET COMPONENTS ${OPENCV_COMPONENTS})
+endif()
 
 if(NOT OpenCV_FOUND)
-    set(OPENCV_COMPONENTS core imgproc imgcodecs highgui world)
-    set(OPENCV_COMPONENTS_ESC "core\\;imgproc\\;imgcodecs\\;highgui\\;world")
+    set(_opencv_build_type "${CMAKE_BUILD_TYPE}")
+    if(NOT _opencv_build_type)
+        set(_opencv_build_type "Release")
+    endif()
     set(OPENCV_FEATURE_ARGS
         -DBUILD_TESTS=OFF
         -DBUILD_PERF_TESTS=OFF
@@ -47,6 +54,10 @@ if(NOT OpenCV_FOUND)
     )
 
     if(WIN32)
+        set(_opencv_debug_suffix "")
+        if(_opencv_build_type STREQUAL "Debug")
+            set(_opencv_debug_suffix "d")
+        endif()
         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)
@@ -69,8 +80,12 @@ if(NOT OpenCV_FOUND)
         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_world_lib_release "${_opencv_libdir}/opencv_world${_opencv_dllversion}.lib")
+        set(_opencv_world_dll_release "${_opencv_bindir}/opencv_world${_opencv_dllversion}.dll")
+        set(_opencv_world_lib_debug "${_opencv_libdir}/opencv_world${_opencv_dllversion}d.lib")
+        set(_opencv_world_dll_debug "${_opencv_bindir}/opencv_world${_opencv_dllversion}d.dll")
+        set(_opencv_world_lib "${_opencv_libdir}/opencv_world${_opencv_dllversion}${_opencv_debug_suffix}.lib")
+        set(_opencv_world_dll "${_opencv_bindir}/opencv_world${_opencv_dllversion}${_opencv_debug_suffix}.dll")
         set(_opencv_include_dir "${OPENCV_INSTALL_DIR}/include")
 
         set(_opencv_byproducts
@@ -86,20 +101,23 @@ if(NOT OpenCV_FOUND)
         )
     endif()
 
+    set(OPENCV_INCLUDE_DIR "${_opencv_include_dir}")
+
     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
+            -DCMAKE_BUILD_TYPE=${_opencv_build_type}
             -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}
+            ${ITLABAI_EXTERNAL_TOOLCHAIN_ARGS}
         CMAKE_CACHE_ARGS
             -DBUILD_LIST:STRING=${OPENCV_COMPONENTS_ESC}
         BUILD_BYPRODUCTS
@@ -114,15 +132,15 @@ if(NOT OpenCV_FOUND)
     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_LOCATION_RELEASE "${_opencv_world_dll_release}"
+            IMPORTED_LOCATION_DEBUG "${_opencv_world_dll_debug}"
+            IMPORTED_LOCATION_RELWITHDEBINFO "${_opencv_world_dll_release}"
+            IMPORTED_LOCATION_MINSIZEREL "${_opencv_world_dll_release}"
             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}"
+            IMPORTED_IMPLIB_RELEASE "${_opencv_world_lib_release}"
+            IMPORTED_IMPLIB_DEBUG "${_opencv_world_lib_debug}"
+            IMPORTED_IMPLIB_RELWITHDEBINFO "${_opencv_world_lib_release}"
+            IMPORTED_IMPLIB_MINSIZEREL "${_opencv_world_lib_release}"
             INTERFACE_INCLUDE_DIRECTORIES "${_opencv_include_dir}"
         )
     else()
diff --git a/cmake/deps/tbb.cmake b/cmake/deps/tbb.cmake
@@ -7,27 +7,23 @@ 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()
+    set(_tbb_build_type "${CMAKE_BUILD_TYPE}")
+    if(NOT _tbb_build_type)
+        set(_tbb_build_type "Release")
     endif()
+    set(_tbb_cmake_args ${ITLABAI_EXTERNAL_TOOLCHAIN_ARGS})
 
     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_debug_suffix "")
+        if(_tbb_build_type STREQUAL "Debug")
+            set(_tbb_debug_suffix "_debug")
+        endif()
+        set(_tbb_release_lib "${TBB_INSTALL_DIR}/lib/tbb12.lib")
+        set(_tbb_release_dll "${TBB_INSTALL_DIR}/bin/tbb12.dll")
+        set(_tbb_debug_lib "${TBB_INSTALL_DIR}/lib/tbb12_debug.lib")
+        set(_tbb_debug_dll "${TBB_INSTALL_DIR}/bin/tbb12_debug.dll")
+        set(_tbb_lib "${TBB_INSTALL_DIR}/lib/tbb12${_tbb_debug_suffix}.lib")
+        set(_tbb_dll "${TBB_INSTALL_DIR}/bin/tbb12${_tbb_debug_suffix}.dll")
         set(_tbb_byproducts
             "${_tbb_lib}"
             "${_tbb_dll}"
@@ -45,7 +41,7 @@ if(NOT TBB_FOUND)
         INSTALL_DIR "${TBB_INSTALL_DIR}"
         CMAKE_ARGS
             -DCMAKE_INSTALL_PREFIX=${TBB_INSTALL_DIR}
-            -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_BUILD_TYPE=${_tbb_build_type}
             -DBUILD_SHARED_LIBS=ON
             -DTBB_TEST=OFF
             -DTBB_EXAMPLES=OFF
@@ -62,15 +58,15 @@ if(NOT TBB_FOUND)
     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_LOCATION_RELEASE "${_tbb_release_dll}"
+            IMPORTED_LOCATION_DEBUG "${_tbb_debug_dll}"
+            IMPORTED_LOCATION_RELWITHDEBINFO "${_tbb_release_dll}"
+            IMPORTED_LOCATION_MINSIZEREL "${_tbb_release_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}"
+            IMPORTED_IMPLIB_RELEASE "${_tbb_release_lib}"
+            IMPORTED_IMPLIB_DEBUG "${_tbb_debug_lib}"
+            IMPORTED_IMPLIB_RELWITHDEBINFO "${_tbb_release_lib}"
+            IMPORTED_IMPLIB_MINSIZEREL "${_tbb_release_lib}"
             INTERFACE_INCLUDE_DIRECTORIES "${TBB_INSTALL_DIR}/include"
         )
     else()
