Improve cmake

JafarAbdi · rhaschke · commit 45ff3ea437b9 · 2023-05-25T17:05:45.000+02:00
- Modernize
- Add include folder for INSTALL_INTERFACE
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -34,8 +34,7 @@ install(DIRECTORY include/ DESTINATION include
 
 pluginlib_export_plugin_description_file(${PROJECT_NAME} motion_planning_stages_plugin_description.xml)
 
-ament_export_include_directories(include)
-ament_export_libraries(${PROJECT_NAME} ${PROJECT_NAME}_stages)
+ament_export_targets(${PROJECT_NAME}Targets HAS_LIBRARY_TARGET)
 ament_export_dependencies(Boost)
 ament_export_dependencies(geometry_msgs)
 ament_export_dependencies(moveit_core)
diff --git a/core/src/CMakeLists.txt b/core/src/CMakeLists.txt
@@ -47,12 +47,13 @@ ament_target_dependencies(${PROJECT_NAME}
 )
 target_include_directories(${PROJECT_NAME}
 	PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-	PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+	       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+	       $<INSTALL_INTERFACE:include>
 )
 
 add_subdirectory(stages)
 
 install(TARGETS ${PROJECT_NAME}
-        EXPORT ${PROJECT_NAME}
+        EXPORT ${PROJECT_NAME}Targets
         ARCHIVE DESTINATION lib
         LIBRARY DESTINATION lib)

Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,13 @@ ament_target_dependencies(${PROJECT_NAME}`
`47`	`47`	`)`
`48`	`48`	`target_include_directories(${PROJECT_NAME}`
`49`	`49`	`PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>`
`50`		`- PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>`
	`50`	`+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>`
	`51`	`+ $<INSTALL_INTERFACE:include>`
`51`	`52`	`)`
`52`	`53`
`53`	`54`	`add_subdirectory(stages)`
`54`	`55`
`55`	`56`	`install(TARGETS ${PROJECT_NAME}`
`56`		`- EXPORT ${PROJECT_NAME}`
	`57`	`+ EXPORT ${PROJECT_NAME}Targets`
`57`	`58`	`ARCHIVE DESTINATION lib`
`58`	`59`	`LIBRARY DESTINATION lib)`