[OpenMP][Libomptarget][NFC] Use CMake Variables

This patchs adds CMake variables to add subdirectories and include
directories for libomptarget and explicitly gives the location of source
files.

Differential Revision: https://reviews.llvm.org/D93290
This commit is contained in:
Atmn 2020-12-05 21:41:09 -05:00
parent ac068e014b
commit 907886cc5b
2 changed files with 13 additions and 11 deletions

View File

@ -59,10 +59,12 @@ if(LIBOMPTARGET_ENABLE_DEBUG)
add_definitions(-DOMPTARGET_DEBUG) add_definitions(-DOMPTARGET_DEBUG)
endif() endif()
include_directories(include) set(LIBOMPTARGET_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
include_directories(${LIBOMPTARGET_INCLUDE_DIR})
# Build target agnostic offloading library. # Build target agnostic offloading library.
add_subdirectory(src) set(LIBOMPTARGET_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
add_subdirectory(${LIBOMPTARGET_SRC_DIR})
# Retrieve the path to the resulting library so that it can be used for # Retrieve the path to the resulting library so that it can be used for
# testing. # testing.

View File

@ -12,19 +12,19 @@
libomptarget_say("Building offloading runtime library libomptarget.") libomptarget_say("Building offloading runtime library libomptarget.")
set(src_files set(LIBOMPTARGET_SRC_FILES
api.cpp ${CMAKE_CURRENT_SOURCE_DIR}/api.cpp
device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device.cpp
interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/interface.cpp
MemoryManager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/MemoryManager.cpp
rtl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rtl.cpp
omptarget.cpp ${CMAKE_CURRENT_SOURCE_DIR}/omptarget.cpp
) )
# Build libomptarget library with libdl dependency. Add LLVMSupport # Build libomptarget library with libdl dependency. Add LLVMSupport
# dependency if building in-tree with profiling enabled. # dependency if building in-tree with profiling enabled.
if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMPTARGET_PROFILING)) if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMPTARGET_PROFILING))
add_library(omptarget SHARED ${src_files}) add_library(omptarget SHARED ${LIBOMPTARGET_SRC_FILES})
target_link_libraries(omptarget target_link_libraries(omptarget
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports") "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports")
@ -32,7 +32,7 @@ else()
set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
Support Support
) )
add_llvm_library(omptarget SHARED ${src_files} add_llvm_library(omptarget SHARED ${LIBOMPTARGET_SRC_FILES}
LINK_LIBS ${CMAKE_DL_LIBS} LINK_LIBS ${CMAKE_DL_LIBS}
"-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports" "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports"
) )