mirror of
https://github.com/moveit/moveit_task_constructor.git
synced 2025-11-04 14:49:57 +08:00
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.
This commit is contained in:
parent
00331414a6
commit
b26576dddc
@ -28,7 +28,6 @@ else()
|
|||||||
endmacro()
|
endmacro()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
set(CMAKE_AUTOMOC ON)
|
||||||
set(CMAKE_AUTORCC ON)
|
set(CMAKE_AUTORCC ON)
|
||||||
add_definitions(-DQT_NO_KEYWORDS)
|
add_definitions(-DQT_NO_KEYWORDS)
|
||||||
|
|||||||
@ -33,7 +33,11 @@ target_link_libraries(${MOVEIT_LIB_NAME}
|
|||||||
target_include_directories(${MOVEIT_LIB_NAME}
|
target_include_directories(${MOVEIT_LIB_NAME}
|
||||||
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||||
PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
|
PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
|
||||||
PRIVATE ${catkin_INCLUDE_DIRS}
|
# https://stackoverflow.com/questions/47175683/cmake-target-link-libraries-propagation-of-include-directories
|
||||||
|
PUBLIC $<TARGET_PROPERTY:motion_planning_tasks_utils,INTERFACE_INCLUDE_DIRECTORIES>
|
||||||
|
PUBLIC $<TARGET_PROPERTY:motion_planning_tasks_properties,INTERFACE_INCLUDE_DIRECTORIES>
|
||||||
|
PUBLIC $<TARGET_PROPERTY:moveit_task_visualization_tools,INTERFACE_INCLUDE_DIRECTORIES>
|
||||||
|
PUBLIC ${catkin_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
|
|
||||||
install(TARGETS ${MOVEIT_LIB_NAME}
|
install(TARGETS ${MOVEIT_LIB_NAME}
|
||||||
|
|||||||
@ -12,7 +12,7 @@ target_link_libraries(${MOVEIT_LIB_NAME}
|
|||||||
)
|
)
|
||||||
target_include_directories(${MOVEIT_LIB_NAME}
|
target_include_directories(${MOVEIT_LIB_NAME}
|
||||||
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
|
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
|
||||||
PUBLIC ${catkin_INCLUDE_DIRS}
|
PRIVATE ${catkin_INCLUDE_DIRS}
|
||||||
)
|
)
|
||||||
|
|
||||||
install(TARGETS ${MOVEIT_LIB_NAME}
|
install(TARGETS ${MOVEIT_LIB_NAME}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user