diff options
| author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2014-06-19 14:07:47 (GMT) |
|---|---|---|
| committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2014-06-19 14:07:47 (GMT) |
| commit | 31f7e13260247c02eb820ebd0be61155d2985e01 (patch) | |
| tree | 0611ea51424783fe1e9514dfa50736d4054e51f7 | |
| parent | f7083045c6f7d23bac47b8302e413becd53fc030 (diff) | |
Use CMAKE_INSTALL_LIBDIR as location for installation.
Change-Id: If2b6ffad5cec9dd687afcbe1ce4c11bbc62c88fc
| -rw-r--r-- | src/compression/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/lib/CMakeLists.txt | 7 |
2 files changed, 10 insertions, 4 deletions
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}) |