build: fix external builds and OpenMP linkage

Author: allnes

app/Accuracy/CMakeLists.txt

@@ -18,4 +18,5 @@ target_compile_definitions(ACCLib PUBLIC IMAGE1_PATH="${ITLABAI_TEST_DATA_DIR}/l
 
 add_executable(Accuracy_Check accuracy_check.cpp)
 target_link_libraries(Accuracy_Check PRIVATE ACCLib OpenCV::opencv_world)
+itlabai_link_externals(Accuracy_Check openmp)
 itlabai_target_defaults(Accuracy_Check)

app/Graph/CMakeLists.txt

@@ -25,7 +25,7 @@ target_link_libraries(Graph_Build PRIVATE BuildGraph)
 itlabai_target_defaults(Graph_Build)
 
 add_executable(ACC acc_check.cpp)
-target_link_libraries(ACC PRIVATE BuildGraph OpenCV::opencv_world Kokkos_imported TBB_unified)
+target_link_libraries(ACC PRIVATE BuildGraph OpenCV::opencv_world)
 itlabai_target_defaults(ACC)
 
 add_executable(onnx_subgraphs onnx_subgraphs.cpp)

cmake/ProjectDefaults.cmake

@@ -41,11 +41,13 @@ function(itlabai_link_externals target_name)
                     endif()
                 endforeach()
                 if(ext STREQUAL "openmp" AND OpenMP_FOUND)
-                    if(DEFINED OpenMP_CXX_FLAGS)
+                    # Ensure both compile and link stages pick up OpenMP flags.
+                    if(DEFINED OpenMP_CXX_FLAGS AND NOT OpenMP_CXX_FLAGS STREQUAL "")
                         string(REPLACE " " ";" _omp_flags "${OpenMP_CXX_FLAGS}")
                         target_compile_options(${target_name} ${_scope} ${_omp_flags})
+                        target_link_options(${target_name} ${_scope} ${_omp_flags})
                     endif()
-                    if(DEFINED OpenMP_EXE_LINKER_FLAGS)
+                    if(DEFINED OpenMP_EXE_LINKER_FLAGS AND NOT OpenMP_EXE_LINKER_FLAGS STREQUAL "")
                         string(REPLACE " " ";" _omp_lflags "${OpenMP_EXE_LINKER_FLAGS}")
                         target_link_options(${target_name} ${_scope} ${_omp_lflags})
                     endif()

cmake/deps/onednn.cmake

@@ -16,6 +16,18 @@ if(NOT dnnl_FOUND)
         set(_onednn_depends tbb_external)
     endif()
 
+    set(_onednn_byproducts "")
+    if(MSVC)
+        list(APPEND _onednn_byproducts
+            ${ONEDNN_INSTALL_DIR}/lib/dnnl.lib
+            ${ONEDNN_INSTALL_DIR}/bin/dnnl.dll
+        )
+    else()
+        list(APPEND _onednn_byproducts
+            ${ONEDNN_INSTALL_DIR}/lib/libdnnl${CMAKE_SHARED_LIBRARY_SUFFIX}
+        )
+    endif()
+
     ExternalProject_Add(onednn_external
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/oneDNN"
         BINARY_DIR "${ONEDNN_BUILD_DIR}"
@@ -36,9 +48,7 @@ if(NOT dnnl_FOUND)
             -DBUILD_SHARED_LIBS=ON
             ${ITLABAI_EXTERNAL_TOOLCHAIN_ARGS}
             ${ITLABAI_EXTERNAL_WARNING_ARGS}
-        BUILD_BYPRODUCTS
-            ${ONEDNN_INSTALL_DIR}/lib/dnnl.lib
-            ${ONEDNN_INSTALL_DIR}/bin/dnnl.dll
+        BUILD_BYPRODUCTS ${_onednn_byproducts}
     )
     add_dependencies(itlabai_external onednn_external)