set CATKIN_PACKAGE_LIBEXEC_DESTINATION which was documented but not s…

…et (#1122)
ros · Sep 28, 2020 · 6fabbc0 · 6fabbc0
1 parent c43325c
commit 6fabbc0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/cmake/catkin_destinations.cmake b/cmake/catkin_destinations.cmake
@@ -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:
@@ -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})
 

diff --git a/doc/dev_guide/generated_cmake_api.rst b/doc/dev_guide/generated_cmake_api.rst
@@ -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:

diff --git a/doc/user_guide/variables.rst b/doc/user_guide/variables.rst
@@ -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}``.