Skip to content

Commit 7950706

Browse files
author
earlaud
committed
Remove duplicate code for AMENT with jrl-cmakemodule
1 parent 6acfc6b commit 7950706

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

CMakeLists.txt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ option(BUILD_UTILS "Build the utils" OFF)
118118
option(BUILD_PYTHON_INTERFACE "Build the Python bindings" ON)
119119
option(GENERATE_PYTHON_STUBS "Generate the Python stubs associated to the Python library" OFF)
120120
option(BUILD_WITH_COMMIT_VERSION "Build libraries by setting specific commit version" OFF)
121+
option(BUILDING_ROS2_PACKAGE "Allow the package to be found using the AMENT system present in ros 2" ON) # ON for backward compatibility
121122

122123
if(DEFINED BUILD_UNIT_TESTS)
123124
message(
@@ -521,17 +522,5 @@ pkg_config_append_cflags("${CFLAGS_OPTIONS}")
521522

522523
# Install catkin package.xml
523524
install(FILES package.xml DESTINATION share/${PROJECT_NAME})
524-
# Allows Colcon to find non-Ament packages when using workspace underlays
525-
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME} "")
526-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/ament_index/resource_index/packages/${PROJECT_NAME}
527-
DESTINATION share/ament_index/resource_index/packages)
528-
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv
529-
"prepend-non-duplicate;AMENT_PREFIX_PATH;")
530-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/ament_prefix_path.dsv
531-
DESTINATION share/${PROJECT_NAME}/hook)
532-
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv
533-
"prepend-non-duplicate;PYTHONPATH;${PYTHON_SITELIB}")
534-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/share/${PROJECT_NAME}/hook/python_path.dsv
535-
DESTINATION share/${PROJECT_NAME}/hook)
536525

537526
setup_project_finalize()

0 commit comments

Comments
 (0)