build(cmake): remove conditional deps and align CI presets

Author: allnes

.github/workflows/ci.yml

@@ -126,7 +126,7 @@ jobs:
       run: |
         OPENMP_PATH=$(brew --prefix libomp)
         echo "OpenMP path: $OPENMP_PATH"
-        cmake --preset dev-release \
+        cmake --preset release \
           -DCMAKE_C_COMPILER_LAUNCHER=ccache \
           -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
           -DCMAKE_PREFIX_PATH=$OPENMP_PATH \
@@ -139,12 +139,12 @@ jobs:
           -DOpenMP_omp_LIBRARY="$OPENMP_PATH/lib/libomp.dylib" \
           -DCMAKE_EXE_LINKER_FLAGS="-L$OPENMP_PATH/lib -lomp" \
           -DCMAKE_SHARED_LINKER_FLAGS="-L$OPENMP_PATH/lib -lomp"
-        cmake --build --preset dev-release --parallel
+        cmake --build --preset release --parallel
       env:
         LDFLAGS: "-L$(brew --prefix libomp)/lib -lomp"
         CPPFLAGS: "-I$(brew --prefix libomp)/include"
     - name: Test
-      run: ctest --preset dev-release --output-on-failure -L unit
+      run: ctest --preset release --output-on-failure -L unit
       env:
         CTEST_OUTPUT_ON_FAILURE: 1
   build-windows:
@@ -167,10 +167,10 @@ jobs:
       uses: ilammy/msvc-dev-cmd@v1
     - name: Build
       run: |
-        cmake --preset dev-release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        cmake --build --preset dev-release --parallel --config Release
+        cmake --preset release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+        cmake --build --preset release --parallel --config Release
     - name: Test
-      run: ctest --preset dev-release --output-on-failure -L unit
+      run: ctest --preset release --output-on-failure -L unit
   build-linux-arm64:
     runs-on: ubuntu-24.04-arm
     steps:

app/ReaderImage/CMakeLists.txt

@@ -4,10 +4,6 @@ add_library(itlabai_reader_image_lib STATIC ${READER_IMG_HEADERS} ${READER_IMG_S
 
 set_target_properties(itlabai_reader_image_lib PROPERTIES LINKER_LANGUAGE CXX)
 
-if(TARGET itlabai_fetch_test_data)
-    add_dependencies(itlabai_reader_image_lib itlabai_fetch_test_data)
-endif()
-
 itlabai_link_externals(itlabai_reader_image_lib opencv tbb openmp)
 itlabai_target_defaults(itlabai_reader_image_lib)
 target_compile_definitions(itlabai_reader_image_lib PUBLIC IMAGE1_PATH="${ITLABAI_TEST_DATA_DIR}/lena.jpg")
@@ -16,5 +12,6 @@ file(GLOB READER_MAIN CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/reader_img.
 add_executable(itlabai_reader_exe ${READER_MAIN})
 set_target_properties(itlabai_reader_exe PROPERTIES OUTPUT_NAME "itlabai_reader")
 target_link_libraries(itlabai_reader_exe PRIVATE itlabai_reader_image_lib)
+add_dependencies(itlabai_reader_exe itlabai_fetch_test_data)
 itlabai_target_defaults(itlabai_reader_exe)
 itlabai_apply_runtime_rpath(itlabai_reader_exe)

cmake/ProjectDefaults.cmake

@@ -45,44 +45,22 @@ endfunction()
 
 function(itlabai_use_opencv target_name)
     itlabai_use_externals_scope(_scope ${target_name})
-    if(TARGET OpenCV::opencv_world)
-        target_link_libraries(${target_name} ${_scope} OpenCV::opencv_world)
-    endif()
-    if(TARGET opencv_external)
-        add_dependencies(${target_name} opencv_external)
-    endif()
+    target_link_libraries(${target_name} ${_scope} OpenCV::opencv_world)
 endfunction()
 
 function(itlabai_use_tbb target_name)
     itlabai_use_externals_scope(_scope ${target_name})
-    if(TARGET TBB::tbb)
-        target_link_libraries(${target_name} ${_scope} TBB::tbb)
-    elseif(TARGET TBB_unified)
-        target_link_libraries(${target_name} ${_scope} TBB_unified)
-    endif()
-    if(TARGET tbb_external)
-        add_dependencies(${target_name} tbb_external)
-    endif()
+    target_link_libraries(${target_name} ${_scope} TBB::tbb)
 endfunction()
 
 function(itlabai_use_onednn target_name)
     itlabai_use_externals_scope(_scope ${target_name})
-    if(TARGET dnnl)
-        target_link_libraries(${target_name} ${_scope} dnnl)
-    endif()
-    if(TARGET onednn_external)
-        add_dependencies(${target_name} onednn_external)
-    endif()
+    target_link_libraries(${target_name} ${_scope} dnnl)
 endfunction()
 
 function(itlabai_use_kokkos target_name)
     itlabai_use_externals_scope(_scope ${target_name})
-    if(TARGET Kokkos_imported)
-        target_link_libraries(${target_name} ${_scope} Kokkos_imported)
-    endif()
-    if(TARGET kokkos_external)
-        add_dependencies(${target_name} kokkos_external)
-    endif()
+    target_link_libraries(${target_name} ${_scope} Kokkos_imported)
     if(MSVC)
         # Suppress Kokkos header warning C4702 only on targets that use Kokkos.
         target_compile_options(${target_name} ${_scope} /wd4702)
@@ -91,22 +69,12 @@ endfunction()
 
 function(itlabai_use_openmp target_name)
     itlabai_use_externals_scope(_scope ${target_name})
-    if(TARGET OpenMP::OpenMP_CXX)
-        target_link_libraries(${target_name} ${_scope} OpenMP::OpenMP_CXX)
-    endif()
+    target_link_libraries(${target_name} ${_scope} OpenMP::OpenMP_CXX)
 endfunction()
 
 function(itlabai_use_gtest target_name)
     itlabai_use_externals_scope(_scope ${target_name})
-    if(TARGET gtest_main)
-        target_link_libraries(${target_name} ${_scope} gtest_main)
-    endif()
-    if(TARGET gtest)
-        target_link_libraries(${target_name} ${_scope} gtest)
-    endif()
-    if(TARGET gtest_external)
-        add_dependencies(${target_name} gtest_external)
-    endif()
+    target_link_libraries(${target_name} ${_scope} gtest_main gtest)
 endfunction()
 
 function(itlabai_use_externals_scope out_var target_name)
@@ -129,7 +97,9 @@ function(itlabai_link_externals target_name)
         elseif(ext STREQUAL "kokkos")
             itlabai_use_kokkos(${target_name})
         elseif(ext STREQUAL "openmp")
-            itlabai_use_openmp(${target_name})
+            if(ITLABAI_ENABLE_OPENMP)
+                itlabai_use_openmp(${target_name})
+            endif()
         elseif(ext STREQUAL "gtest")
             itlabai_use_gtest(${target_name})
         endif()

cmake/deps/onednn.cmake

@@ -2,10 +2,6 @@ set(ONEDNN_BUILD_DIR "${ITLABAI_EXTERNAL_BUILD_ROOT}/onednn")
 set(ONEDNN_INSTALL_DIR "${ITLABAI_EXTERNAL_INSTALL_ROOT}/onednn")
 
 set(_onednn_build_type "${ITLABAI_EXTERNAL_BUILD_TYPE}")
-set(_onednn_depends "")
-if(TARGET tbb_external)
-    set(_onednn_depends tbb_external)
-endif()
 
 set(_onednn_byproducts "")
 if(MSVC)
@@ -24,7 +20,7 @@ itlabai_external_add(
     SOURCE_DIR "${PROJECT_SOURCE_DIR}/3rdparty/oneDNN"
     BINARY_DIR "${ONEDNN_BUILD_DIR}"
     INSTALL_DIR "${ONEDNN_INSTALL_DIR}"
-    DEPENDS ${_onednn_depends}
+    DEPENDS tbb_external
     CMAKE_ARGS
         -DCMAKE_BUILD_TYPE=${_onednn_build_type}
         -DDNNL_BUILD_TESTS=OFF