From 7e99414c233d5ccfe33052ce61bd5eda726b2617 Mon Sep 17 00:00:00 2001 From: jmcarcell Date: Mon, 17 Jul 2023 22:15:51 +0200 Subject: [PATCH] Respect CMAKE_INSTALL_ and don't put libraries in lib64 --- CMakeLists.txt | 4 ++++ src/CMakeLists.txt | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6daefbd..5c2084a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,10 @@ FIND_PACKAGE( ILCUTIL COMPONENTS ILCSOFT_CMAKE_MODULES REQUIRED ) # load default settings from ILCSOFT_CMAKE_MODULES INCLUDE( ilcsoft_default_settings ) +# Build to lib instead of lib64: +if (CMAKE_INSTALL_LIBDIR STREQUAL lib64) + set(CMAKE_INSTALL_LIBDIR lib) +endif() # root is needed to build tgeo OPTION( GEAR_TGEO "Set to ON to build tgeo (ROOT >= 5.27.06 required)" OFF ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8db0ddc..31fafd6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -48,7 +48,7 @@ ENDIF() # -------- libgearxml -------------------------------- AUX_SOURCE_DIRECTORY( ./gearxml libgearxml_srcs ) ADD_SHARED_LIBRARY( gearxml ${libgearxml_srcs} ) -INSTALL_SHARED_LIBRARY( gearxml DESTINATION lib ) +INSTALL_SHARED_LIBRARY( gearxml DESTINATION ${CMAKE_INSTALL_LIBDIR} ) TARGET_LINK_LIBRARIES( gearxml gear ${CMAKE_DL_LIBS} ) @@ -74,7 +74,7 @@ IF( BUILD_TESTING ) INSTALL( TARGETS printMaterials DESTINATION bin ) ENDIF() - INSTALL( TARGETS mergeXML printParameters DESTINATION bin ) + INSTALL( TARGETS mergeXML printParameters DESTINATION ${CMAKE_INSTALL_BINDIR} ) # test binaries SET( test_bins