Skip to content

Commit 0d39fbd

Browse files
committed
[offload] Move LIBOMPTARGET_OPENMP_*_FOLDER from openmp
Move `LIBOMPTARGET_OPENMP_HEADER_FOLDER` and `LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER` definitions from openmp to offload, as they are only used in the latter project.
1 parent 4b92fb7 commit 0d39fbd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

offload/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,12 @@ set(LIBOMPTARGET_LLVM_LIBRARY_DIR "${LLVM_LIBRARY_DIR}" CACHE STRING
351351
set(LIBOMPTARGET_LLVM_LIBRARY_INTDIR "${LIBOMPTARGET_INTDIR}" CACHE STRING
352352
"Path to folder where intermediate libraries will be output")
353353

354+
# Definitions for testing, for reuse when testing libomptarget-nvptx.
355+
set(LIBOMPTARGET_OPENMP_HEADER_FOLDER "${LIBOMP_INCLUDE_DIR}" CACHE STRING
356+
"Path to folder containing omp.h")
357+
set(LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER "${LIBOMP_LIBRARY_DIR}" CACHE STRING
358+
"Path to folder containing libomp.so, and libLLVMSupport.so with profiling enabled")
359+
354360
# Build offloading plugins and device RTLs if they are available.
355361
add_subdirectory(plugins-nextgen)
356362
add_subdirectory(DeviceRTL)

openmp/runtime/src/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,6 @@ if(NOT WIN32)
272272
endif()
273273
endif()
274274

275-
# Definitions for testing, for reuse when testing libomptarget-nvptx.
276-
set(LIBOMPTARGET_OPENMP_HEADER_FOLDER "${LIBOMP_INCLUDE_DIR}" CACHE STRING
277-
"Path to folder containing omp.h")
278-
set(LIBOMPTARGET_OPENMP_HOST_RTL_FOLDER "${LIBOMP_LIBRARY_DIR}" CACHE STRING
279-
"Path to folder containing libomp.so, and libLLVMSupport.so with profiling enabled")
280-
281275
# Create *.inc before compiling any sources
282276
# objects depend on : .inc files
283277
add_custom_target(libomp-needed-headers DEPENDS kmp_i18n_id.inc kmp_i18n_default.inc)

0 commit comments

Comments
 (0)