Scope OpenMP to consuming targets

Author: allnes

CMakeLists.txt

@@ -34,11 +34,18 @@ find_package(OpenMP REQUIRED COMPONENTS CXX)
 
 if(OpenMP_FOUND)
     message(STATUS "OpenMP found - enabling parallel support")
-    link_libraries(OpenMP::OpenMP_CXX)
 else()
     message(STATUS "OpenMP not found - parallel features disabled")
 endif()
 
+set(ITLABAI_OPENMP_INCLUDE_DIR "" CACHE PATH
+    "Optional extra include directory for the OpenMP runtime headers")
+if(ITLABAI_OPENMP_INCLUDE_DIR AND TARGET OpenMP::OpenMP_CXX)
+    set_property(TARGET OpenMP::OpenMP_CXX APPEND PROPERTY
+        INTERFACE_INCLUDE_DIRECTORIES "${ITLABAI_OPENMP_INCLUDE_DIR}"
+    )
+endif()
+
 add_library(itlabai_sycl INTERFACE)
 
 if(ITLABAI_ENABLE_SYCL)

scripts/ci/sycl_configure.py

@@ -38,7 +38,7 @@ def main() -> None:
 
     openmp_include_dir = os.environ.get("ITLABAI_OPENMP_INCLUDE_DIR", "")
     if openmp_include_dir:
-        cmake_args.append(f"-DOpenMP_CXX_INCLUDE_DIR={openmp_include_dir}")
+        cmake_args.append(f"-DITLABAI_OPENMP_INCLUDE_DIR={openmp_include_dir}")
 
     run(
         [

scripts/ci/sycl_x86_setup.py

@@ -197,7 +197,11 @@ def setup_unix_compilers(sycl_root: Path) -> None:
         if openmp_library is None:
             main_error("Unable to locate libiomp5.so for the SYCL toolchain")
 
-        search_roots = [Path(capture([str(cxx_path), "-print-resource-dir"])), sycl_root, Path("/opt/intel/oneapi")]
+        search_roots = [
+            Path(capture([str(cxx_path), "-print-resource-dir"])),
+            sycl_root,
+            Path("/opt/intel/oneapi"),
+        ]
         search_roots.extend(Path("/usr/lib").glob("llvm-*"))
         openmp_header = find_file(search_roots, "omp.h")
         if openmp_header is None: