From 31f7e13260247c02eb820ebd0be61155d2985e01 Mon Sep 17 00:00:00 2001 From: Magnus Lundborg Date: Thu, 19 Jun 2014 16:07:47 +0200 Subject: Use CMAKE_INSTALL_LIBDIR as location for installation. Change-Id: If2b6ffad5cec9dd687afcbe1ce4c11bbc62c88fc diff --git a/src/compression/CMakeLists.txt b/src/compression/CMakeLists.txt index 3efd6bb..8bb0220 100644 --- a/src/compression/CMakeLists.txt +++ b/src/compression/CMakeLists.txt @@ -7,6 +7,9 @@ if(UNIX) target_link_libraries(tng_compress m) endif() +# Use GNUInstallDirst to set paths on multiarch systems +include(GNUInstallDirs) + install(TARGETS tng_compress - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 81b5843..838f827 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -29,6 +29,9 @@ if(TNG_BUILD_WITH_ZLIB) target_link_libraries(tng_io ${ZLIB_LIBRARIES}) endif() +# Use GNUInstallDirst to set paths on multiarch systems +include(GNUInstallDirs) + install(TARGETS tng_io - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- cgit v0.10.1