From d5c2fa0813a8619d68405d32de4861f7a66b852c Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 13 Apr 2016 00:21:07 +0200 Subject: [PATCH] Install cmake modules into arch dependent path Remove a previous hack that set the library path to /usr. Delegate the path to ${CMAKE_INSTALL_FULL_LIBDIR} which should know where to put it in the different distributions. --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37ba0110..ecb36992 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,9 +12,6 @@ message (STATUS "${PROJECT_NAME} version ${URDF_VERSION}") include(GNUInstallDirs) -# hack: by default this would be 'lib/x86_64-linux-gnu' -set(CMAKE_INSTALL_LIBDIR lib) - # set the default build type if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) @@ -62,7 +59,7 @@ add_subdirectory(urdf_parser) if(WIN32 AND NOT CYGWIN) set(CMAKE_CONFIG_INSTALL_DIR CMake) else() - set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake/) + set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/cmake/) endif() set(PKG_NAME ${PROJECT_NAME})