From b95cb19c8fb2ff9825769def82157d8a4f59e2c4 Mon Sep 17 00:00:00 2001 From: Ghislain Antony Vaillant Date: Fri, 11 Nov 2016 10:49:53 +0000 Subject: [PATCH] Add support for multiarch. Gbp-Pq: Name Add-support-for-multiarch.patch --- CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6b7589..b614f71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,10 +198,12 @@ target_link_libraries(ismrmrd ${ISMRMRD_TARGET_LINK_LIBS}) list(APPEND ISMRMRD_LIBRARIES ismrmrd) # Add to list of libraries to be found list(APPEND ISMRMRD_LIBRARY_DIRS ${CMAKE_BINARY_DIR} ) # Add to list of directories to find libaries +include(GNUInstallDirs) + # install the main library install(TARGETS ismrmrd EXPORT ISMRMRDTargets - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION bin COMPONENT Devel ) @@ -257,7 +259,7 @@ configure_file(cmake/ISMRMRDConfig.cmake.in set(CONFIG_ISMRMRD_SCHEMA_DIR ${CMAKE_INSTALL_PREFIX}/share/ismrmrd/schema) set(CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include) -set(CONFIG_ISMRMRD_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/lib) +set(CONFIG_ISMRMRD_LIBRARY_DIRS ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) if (ISMRMRD_DATASET_SUPPORT) list(APPEND CONFIG_ISMRMRD_TARGET_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS}) list(APPEND CONFIG_ISMRMRD_LIBRARY_DIRS ${HDF5_LIBRARY_DIRS}) @@ -268,7 +270,7 @@ configure_file(cmake/ISMRMRDConfig.cmake.in @ONLY ) -set(ConfigPackageLocation lib/cmake/ISMRMRD) +set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/ISMRMRD) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/InstallFiles/ISMRMRDConfig.cmake" -- 2.30.2