[CMake] Libraries are installed to /usr/lib and not /usr/lib64 on x86_64

https://bugs.webkit.org/show_bug.cgi?id=71507

Reviewed by Antonio Gomes.

.:

* Source/cmake/OptionsCommon.cmake: Provide two variables which
can be changed via CMake: LIB_SUFFIX, which is often used in CMake
projects to let the user choose whether a suffix should be added
to the library installation directory (such as 32 or 64), and
LIB_INSTALL_DIR, which takes LIB_SUFFIX into account to determine
whether to install libraries.

Source/JavaScriptCore:

* CMakeLists.txt: Use ${LIB_INSTALL_DIR} instead of hardcoding "lib".

Source/WebCore:

No new tests, buildsystem change.

* CMakeLists.txt: Use ${LIB_INSTALL_DIR} instead of hardcoding "lib".

Source/WebKit:

* CMakeLists.txt: Use ${LIB_INSTALL_DIR} instead of hardcoding "lib".

Source/WebKit2:

* CMakeLists.txt: Use ${LIB_INSTALL_DIR} instead of hardcoding "lib".

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@109695 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index bc8b1376312b038bc168007770721ff3a28d5520..9c3488803578fef6eaceef916bd0dc241a6a097f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-03-04  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Libraries are installed to /usr/lib and not /usr/lib64 on x86_64
+        https://bugs.webkit.org/show_bug.cgi?id=71507
+
+        Reviewed by Antonio Gomes.
+
+        * Source/cmake/OptionsCommon.cmake: Provide two variables which
+        can be changed via CMake: LIB_SUFFIX, which is often used in CMake
+        projects to let the user choose whether a suffix should be added
+        to the library installation directory (such as 32 or 64), and
+        LIB_INSTALL_DIR, which takes LIB_SUFFIX into account to determine
+        whether to install libraries.
+
 2012-03-03  Hans Wennborg  <hans@chromium.org>
 
         Implement Speech JavaScript API

diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index 2afcbdc657239cd34c36a756188f9a64f7876245..bad6e1047f87953cd6a39e94c12cbabea5d4c973 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -307,5 +307,5 @@ ENDIF ()
 
 IF (SHARED_CORE)
     SET_TARGET_PROPERTIES(${JavaScriptCore_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-    INSTALL(TARGETS ${JavaScriptCore_LIBRARY_NAME} DESTINATION lib)
+    INSTALL(TARGETS ${JavaScriptCore_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")
 ENDIF ()

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index feb759c70f511f16b1d4a2cc311ebd23bb947859..afd64b2540a89c4f2f21b35a1f41b82bba728543 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-04  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Libraries are installed to /usr/lib and not /usr/lib64 on x86_64
+        https://bugs.webkit.org/show_bug.cgi?id=71507
+
+        Reviewed by Antonio Gomes.
+
+        * CMakeLists.txt: Use ${LIB_INSTALL_DIR} instead of hardcoding "lib".
+
 2012-03-04  David Kilzer  <ddkilzer@apple.com>
 
         Fix build when the classic interpreter is enabled

diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 1e34483447aace6534eba989a030f0baf8b8cbf2..01fe147121955b7027074b16307e8913e11909c7 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -2513,5 +2513,5 @@ ENDIF ()
 
 IF (SHARED_CORE)
     SET_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-    INSTALL(TARGETS ${WebCore_LIBRARY_NAME} DESTINATION lib)
+    INSTALL(TARGETS ${WebCore_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")
 ENDIF ()

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index ead561c30febac5565e97df3e322da3aa32a4e63..77b9b4f12c6c152cd8238330d034f58785787982 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-04  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Libraries are installed to /usr/lib and not /usr/lib64 on x86_64
+        https://bugs.webkit.org/show_bug.cgi?id=71507
+
+        Reviewed by Antonio Gomes.
+
+        No new tests, buildsystem change.
+
+        * CMakeLists.txt: Use ${LIB_INSTALL_DIR} instead of hardcoding "lib".
+
 2012-03-04  Hyowon Kim  <hw1008.kim@samsung.com>
 
         [EFL] Implementation of missing functions in GraphicsContext3DPrivate

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index 8bf565edcd309e5dd573e45aaab0decce1d9ffc6..cef474b519abef6dd933d479e96af5fefa3e866c 100644 (file)
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -84,4 +84,4 @@ IF (VERSION_SCRIPT)
 ENDIF ()
 
 SET_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-INSTALL(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION lib)
+INSTALL(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 25d3f78a81260d934f9f298fb702ec749efd9136..3a69766f0437833afef6f6eebd35e3d451b7e5a7 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-04  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Libraries are installed to /usr/lib and not /usr/lib64 on x86_64
+        https://bugs.webkit.org/show_bug.cgi?id=71507
+
+        Reviewed by Antonio Gomes.
+
+        * CMakeLists.txt: Use ${LIB_INSTALL_DIR} instead of hardcoding "lib".
+
 2012-02-24  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
 
         [EFL][DRT] Implement setValueForUser and setAutofilled.

diff --git a/Source/WebKit2/CMakeLists.txt b/Source/WebKit2/CMakeLists.txt
index 0dc836c00ba63f08bda1e1253e8f142abe3b2e6d..812ee811aebd94137a8e2366b2bdb23ffbc12421 100644 (file)
--- a/Source/WebKit2/CMakeLists.txt
+++ b/Source/WebKit2/CMakeLists.txt
@@ -526,4 +526,4 @@ IF (WebKit2_LINK_FLAGS)
     ADD_TARGET_PROPERTIES(${WebProcess_NAME} LINK_FLAGS "${WebKit2_LINK_FLAGS}")
 ENDIF ()
 
-INSTALL(TARGETS ${WebKit2_LIBRARY_NAME} DESTINATION lib)
+INSTALL(TARGETS ${WebKit2_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index a74bbd349b41a4fe3bb0e11b39e6996b06a64b6c..5b2580be9db67c56a980f29c7eb8eb9e55f35838 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2012-03-04  Raphael Kubo da Costa  <kubo@profusion.mobi>
+
+        [CMake] Libraries are installed to /usr/lib and not /usr/lib64 on x86_64
+        https://bugs.webkit.org/show_bug.cgi?id=71507
+
+        Reviewed by Antonio Gomes.
+
+        * CMakeLists.txt: Use ${LIB_INSTALL_DIR} instead of hardcoding "lib".
+
 2012-03-03  Simon Hausmann  <simon.hausmann@nokia.com>
 
         [Qt] Fix static_libs_as_shared build

diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index d94a942b876257dc4521f69533ed92225f889805..a1d918ee8003d6a7891a5b2927952bd57e62c263 100644 (file)
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -14,3 +14,7 @@ ELSEIF (CMAKE_SYSTEM_NAME MATCHES QNX)
 ELSE ()
     SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
 ENDIF ()
+
+SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+
+SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Where to install libraries (lib${LIB_SUFFIX})")