From d97008edb212c790886ee253d15558d85a108b54 Mon Sep 17 00:00:00 2001 From: Antoine Bussy Date: Thu, 23 Jan 2025 18:17:20 +0100 Subject: [PATCH] Changed CMAKE_INSTALL_FULL_ to CMAKE_INSTALL_ See CMake documentation: https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html These variables shouldn't be used in install() commands as they do not work with the cmake --install command's --prefix option, or with the cpack installer generators. --- CMakeLists.txt | 10 +++++----- src/compat/crocoddyl/CMakeLists.txt | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 111e357ab..a08b4bebf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -444,20 +444,20 @@ ADD_SOURCE_GROUP(LIB_SOURCES) install( TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} - INCLUDES DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) if(DOWNLOAD_TRACY) install( TARGETS TracyClient EXPORT ${TARGETS_EXPORT_NAME} - LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/aligator - ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/aligator + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/aligator + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/aligator ) message( STATUS - "Installing TracyClient target to ${CMAKE_INSTALL_FULL_LIBDIR}/aligator" + "Installing TracyClient target to ${CMAKE_INSTALL_LIBDIR}/aligator" ) endif() diff --git a/src/compat/crocoddyl/CMakeLists.txt b/src/compat/crocoddyl/CMakeLists.txt index 1833891f7..317160282 100644 --- a/src/compat/crocoddyl/CMakeLists.txt +++ b/src/compat/crocoddyl/CMakeLists.txt @@ -1,7 +1,7 @@ set(INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/compat/crocoddyl) set( CROC_INSTALL_INCLUDE_DIR - ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}/compat/crocoddyl + ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/compat/crocoddyl ) file(GLOB_RECURSE HEADERS ${INCLUDE_DIR}/*.hpp ${INCLUDE_DIR}/*.hxx) @@ -36,5 +36,5 @@ install( TARGETS aligator_croc_compat EXPORT ${TARGETS_EXPORT_NAME} PUBLIC_HEADER DESTINATION ${CROC_INSTALL_INCLUDE_DIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )