Skip to content

Commit b26576d

Browse files
committed
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.
1 parent 0033141 commit b26576d

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

visualization/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ else()
2828
endmacro()
2929
endif()
3030

31-
set(CMAKE_INCLUDE_CURRENT_DIR ON)
3231
set(CMAKE_AUTOMOC ON)
3332
set(CMAKE_AUTORCC ON)
3433
add_definitions(-DQT_NO_KEYWORDS)

visualization/motion_planning_tasks/src/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ target_link_libraries(${MOVEIT_LIB_NAME}
3333
target_include_directories(${MOVEIT_LIB_NAME}
3434
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
3535
PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
36-
PRIVATE ${catkin_INCLUDE_DIRS}
36+
# https://stackoverflow.com/questions/47175683/cmake-target-link-libraries-propagation-of-include-directories
37+
PUBLIC $<TARGET_PROPERTY:motion_planning_tasks_utils,INTERFACE_INCLUDE_DIRECTORIES>
38+
PUBLIC $<TARGET_PROPERTY:motion_planning_tasks_properties,INTERFACE_INCLUDE_DIRECTORIES>
39+
PUBLIC $<TARGET_PROPERTY:moveit_task_visualization_tools,INTERFACE_INCLUDE_DIRECTORIES>
40+
PUBLIC ${catkin_INCLUDE_DIRS}
3741
)
3842

3943
install(TARGETS ${MOVEIT_LIB_NAME}

visualization/motion_planning_tasks/utils/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ target_link_libraries(${MOVEIT_LIB_NAME}
1212
)
1313
target_include_directories(${MOVEIT_LIB_NAME}
1414
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
15-
PUBLIC ${catkin_INCLUDE_DIRS}
15+
PRIVATE ${catkin_INCLUDE_DIRS}
1616
)
1717

1818
install(TARGETS ${MOVEIT_LIB_NAME}

0 commit comments

Comments
 (0)