Skip to content

register package in ament index #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dirk-thomas merged 3 commits into from
Jan 9, 2020
+22 −39
Merged

register package in ament index #14

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51605f3
register package in ament index
mikaelarguedas Dec 11, 2019
5f61fa7
remove now unnecessary templates
mikaelarguedas Dec 16, 2019
4007472
add FindTinyXML.cmake to module path
mikaelarguedas Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ option(FORCE_BUILD_VENDOR_PKG
"Build TinyXML from source, even if system-installed package is available"
OFF)

find_package(ament_cmake REQUIRED)

if(NOT FORCE_BUILD_VENDOR_PKG)
list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
find_package(TinyXML)
Expand Down Expand Up @@ -37,16 +39,6 @@ else()
message(STATUS "Found TinyXML. Using TinyXML from system.")
endif()

configure_file(tinyxml_vendorConfig.cmake.in "${PROJECT_BINARY_DIR}/tinyxml_vendorConfig.cmake" @ONLY)
configure_file(tinyxml_vendorConfig-version.cmake.in "${PROJECT_BINARY_DIR}/tinyxml_vendorConfig-version.cmake" @ONLY)
Comment thread
dirk-thomas marked this conversation as resolved.

install(DIRECTORY cmake DESTINATION share/${PROJECT_NAME})

install(FILES
package.xml
DESTINATION share/${PROJECT_NAME})

install(FILES
"${PROJECT_BINARY_DIR}/tinyxml_vendorConfig.cmake"
"${PROJECT_BINARY_DIR}/tinyxml_vendorConfig-version.cmake"
DESTINATION share/${PROJECT_NAME}/cmake)
ament_package()
4 changes: 2 additions & 2 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<maintainer email="steven@openrobotics.org">Steven! Ragnarök</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>cmake</buildtool_depend>
<buildtool_depend>ament_cmake</buildtool_depend>

<depend>tinyxml</depend>

<export>
<build_type>cmake</build_type>
<build_type>ament_cmake</build_type>
</export>
</package>