From 4e1a0387eb885b966e59d6a3e42ce2ea44e8fdb6 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Mon, 26 May 2014 22:23:31 +0200 Subject: [PATCH] avoid hard-coding lib path The destination of libraries can be lib64 on some x86_64 distros. Allow changing that via -DCMAKE_INSTALL_LIBDIR and use GNUInstallDirs to ensures that there is a default value. Change-Id: Ie6cfebcba4bdfacf6a6c9e86679f69f20898d3ca Signed-off-by: Patrick Ohly --- cpp/CMakeLists.txt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 3539b94..1eeaa2f 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -20,6 +20,8 @@ project (libphonenumber) set (libphonenumber_VERSION_MAJOR 7) set (libphonenumber_VERSION_MINOR 0) +include ( GNUInstallDirs ) + # Helper functions dealing with finding libraries and programs this library # depends on. @@ -554,17 +556,17 @@ install (FILES install (FILES "src/phonenumbers/base/synchronization/lock.h" DESTINATION include/phonenumbers/base/synchronization/) -install (TARGETS phonenumber LIBRARY DESTINATION lib/ ARCHIVE DESTINATION lib/) +install (TARGETS phonenumber LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) if (BUILD_SHARED_LIB) - install (TARGETS phonenumber-shared LIBRARY DESTINATION lib/ ARCHIVE - DESTINATION lib/) + install (TARGETS phonenumber-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE + DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif () if (${BUILD_GEOCODER} STREQUAL "ON") - install (TARGETS geocoding LIBRARY DESTINATION lib/ ARCHIVE DESTINATION lib/) - install (TARGETS geocoding-shared LIBRARY DESTINATION lib/ ARCHIVE - DESTINATION lib/) + install (TARGETS geocoding LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install (TARGETS geocoding-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE + DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif () # Build an example program using geocoding, mainly to make sure that both -- 2.7.4