From 7e75df256c8919815ac01da7b5d0344acd748eca Mon Sep 17 00:00:00 2001
From: aurianer <aurianer@cscs.ch>
Date: Fri, 12 Jul 2019 16:30:27 +0200
Subject: [PATCH] Change include_directories to target_include_directories

The goal is to remove the include_directories from HPX as it includes
the directories for ALL targets. We want to make those includes target
specific.
---
 src/apex/CMakeLists.hpx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/apex/CMakeLists.hpx b/src/apex/CMakeLists.hpx
index 59f91dce..9a2ca1c4 100644
--- a/src/apex/CMakeLists.hpx
+++ b/src/apex/CMakeLists.hpx
@@ -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.
@@ -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")