Skip to content

Commit

Permalink
Merge pull request #106 from aurianer/change_include_to_target_include
Browse files Browse the repository at this point in the history
Change include_directories to target_include_directories
  • Loading branch information
khuck authored Jul 15, 2019
2 parents 41a650b + 7e75df2 commit cd646da
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/apex/CMakeLists.hpx
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ set(APEX_BINARY_DIR ${APEX_BINARY_DIR} PARENT_SCOPE)
hpx_info("apex" "APEX source dir is ${APEX_SOURCE_DIR}")
hpx_info("apex" "APEX binary dir is ${APEX_BINARY_DIR}")

include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${APEX_BINARY_DIR} ${CMAKE_SOURCE_DIR}/apex/src/contrib)

# This macro will make sure that the hpx/config.h file is included
add_definitions(-DAPEX_HAVE_HPX_CONFIG)
# This macro will be added to the hpx/config.h file.
Expand Down Expand Up @@ -381,6 +379,11 @@ add_hpx_library(apex
HEADERS ${apex_headers}
DEPENDENCIES hpx_assertion hpx_cache hpx_hardware
FOLDER "Core/Dependencies")
target_include_directories(apex PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
$<BUILD_INTERFACE:${APEX_BINARY_DIR}>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/apex/src/contrib>)

#if(APPLE)
#hpx_add_link_flag("-weak_library libhpx_taudummy.dylib -flat_namespace")
Expand Down

0 comments on commit cd646da

Please sign in to comment.