Skip to content
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

set CATKIN_PACKAGE_LIBEXEC_DESTINATION which was documented but not set #1122

Merged
merged 1 commit into from
Sep 28, 2020
Merged

set CATKIN_PACKAGE_LIBEXEC_DESTINATION which was documented but not set #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions cmake/catkin_destinations.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
# See :cmake:data:`CATKIN_PACKAGE_INCLUDE_DESTINATION`.
# :outvar CATKIN_PACKAGE_LIB_DESTINATION:
# See :cmake:data:`CATKIN_PACKAGE_LIB_DESTINATION`.
# :outvar CATKIN_PACKAGE_LIBEXEC_DESTINATION:
# See :cmake:data:`CATKIN_PACKAGE_LIBEXEC_DESTINATION`.
# :outvar CATKIN_PACKAGE_PYTHON_DESTINATION:
# See :cmake:data:`CATKIN_PACKAGE_PYTHON_DESTINATION`.
# :outvar CATKIN_PACKAGE_SHARE_DESTINATION:
Expand Down Expand Up @@ -47,6 +49,7 @@ macro(catkin_destinations)
set(CATKIN_PACKAGE_ETC_DESTINATION ${CATKIN_GLOBAL_ETC_DESTINATION}/${PROJECT_NAME})
set(CATKIN_PACKAGE_INCLUDE_DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}/${PROJECT_NAME})
set(CATKIN_PACKAGE_LIB_DESTINATION ${CATKIN_GLOBAL_LIB_DESTINATION})
set(CATKIN_PACKAGE_LIBEXEC_DESTINATION ${CATKIN_GLOBAL_LIB_DESTINATION}/${PROJECT_NAME})
set(CATKIN_PACKAGE_PYTHON_DESTINATION ${CATKIN_GLOBAL_PYTHON_DESTINATION}/${PROJECT_NAME})
set(CATKIN_PACKAGE_SHARE_DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/${PROJECT_NAME})

Expand Down
2 changes: 2 additions & 0 deletions doc/dev_guide/generated_cmake_api.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,8 @@ Non-public CMake functions / macros
See :cmake:data:`CATKIN_PACKAGE_INCLUDE_DESTINATION`.
:outvar CATKIN_PACKAGE_LIB_DESTINATION:
See :cmake:data:`CATKIN_PACKAGE_LIB_DESTINATION`.
:outvar CATKIN_PACKAGE_LIBEXEC_DESTINATION:
See :cmake:data:`CATKIN_PACKAGE_LIBEXEC_DESTINATION`.
:outvar CATKIN_PACKAGE_PYTHON_DESTINATION:
See :cmake:data:`CATKIN_PACKAGE_PYTHON_DESTINATION`.
:outvar CATKIN_PACKAGE_SHARE_DESTINATION:
Expand Down
5 changes: 5 additions & 0 deletions doc/user_guide/variables.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ They only contain relative paths and are supposed to be relative to the ``${CMAK
This is set to ``${CATKIN_GLOBAL_LIB_DESTINATION}``.
All libraries go into a global folder. Still use this variable instead of ``CATKIN_GLOBAL_LIB_DESTINATION`` for package libraries.

.. cmake:data:: CATKIN_PACKAGE_LIBEXEC_DESTINATION

This is set to ``${CATKIN_GLOBAL_LIB_DESTINATION}``/${PROJECT_NAME}.
All package-specific executables go into this folder.

.. cmake:data:: CATKIN_PACKAGE_PYTHON_DESTINATION

This is set to ``${CATKIN_GLOBAL_PYTHON_DESTINATION}/${PROJECT_NAME}``.
Expand Down