From: Patrick Ohly <patrick.ohly@intel.com>
Date: Mon, 26 May 2014 20:23:31 +0000 (+0200)
Subject: avoid hard-coding lib path
X-Git-Tag: accepted/tizen/common/20140918.092918~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c14ba07b4aa803639a1cacc105350c978277c2b0;p=platform%2Fupstream%2Flibphonenumber.git

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 <patrick.ohly@intel.com>
---

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index b687dd1..74bde53 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -20,6 +20,8 @@ project (libphonenumber)
 set (libphonenumber_VERSION_MAJOR 6)
 set (libphonenumber_VERSION_MINOR 2)
 
+include ( GNUInstallDirs )
+
 # Helper functions dealing with finding libraries and programs this library
 # depends on.
 
@@ -549,17 +551,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