From b26576dddc0fc3590fe7ff3b2e8a76f6808360f8 Mon Sep 17 00:00:00 2001 From: Robert Haschke Date: Thu, 5 Mar 2020 13:10:40 +0100 Subject: [PATCH] fix include order As INCLUDE_DIRECTORIES of target_link_libraries always go AFTER those from target_include_directories, we need to explicitly provide the include order for local targets. --- visualization/CMakeLists.txt | 1 - visualization/motion_planning_tasks/src/CMakeLists.txt | 6 +++++- visualization/motion_planning_tasks/utils/CMakeLists.txt | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/visualization/CMakeLists.txt b/visualization/CMakeLists.txt index 999a87a8..27cd6d6f 100644 --- a/visualization/CMakeLists.txt +++ b/visualization/CMakeLists.txt @@ -28,7 +28,6 @@ else() endmacro() endif() -set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) add_definitions(-DQT_NO_KEYWORDS) diff --git a/visualization/motion_planning_tasks/src/CMakeLists.txt b/visualization/motion_planning_tasks/src/CMakeLists.txt index 5472ad9c..1c814348 100644 --- a/visualization/motion_planning_tasks/src/CMakeLists.txt +++ b/visualization/motion_planning_tasks/src/CMakeLists.txt @@ -33,7 +33,11 @@ target_link_libraries(${MOVEIT_LIB_NAME} target_include_directories(${MOVEIT_LIB_NAME} PUBLIC $ PRIVATE $ - PRIVATE ${catkin_INCLUDE_DIRS} + # https://stackoverflow.com/questions/47175683/cmake-target-link-libraries-propagation-of-include-directories + PUBLIC $ + PUBLIC $ + PUBLIC $ + PUBLIC ${catkin_INCLUDE_DIRS} ) install(TARGETS ${MOVEIT_LIB_NAME} diff --git a/visualization/motion_planning_tasks/utils/CMakeLists.txt b/visualization/motion_planning_tasks/utils/CMakeLists.txt index 34c61946..cab82cae 100644 --- a/visualization/motion_planning_tasks/utils/CMakeLists.txt +++ b/visualization/motion_planning_tasks/utils/CMakeLists.txt @@ -12,7 +12,7 @@ target_link_libraries(${MOVEIT_LIB_NAME} ) target_include_directories(${MOVEIT_LIB_NAME} PUBLIC $ - PUBLIC ${catkin_INCLUDE_DIRS} + PRIVATE ${catkin_INCLUDE_DIRS} ) install(TARGETS ${MOVEIT_LIB_NAME}