- Revision
- 109695
- Author
- [email protected]
- Date
- 2012-03-04 19:01:38 -0800 (Sun, 04 Mar 2012)
Log Message
[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/_javascript_Core:
* 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".
Modified Paths
Diff
Modified: trunk/ChangeLog (109694 => 109695)
--- trunk/ChangeLog 2012-03-05 02:43:37 UTC (rev 109694)
+++ trunk/ChangeLog 2012-03-05 03:01:38 UTC (rev 109695)
@@ -1,3 +1,17 @@
+2012-03-04 Raphael Kubo da Costa <[email protected]>
+
+ [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 <[email protected]>
Implement Speech _javascript_ API
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (109694 => 109695)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2012-03-05 02:43:37 UTC (rev 109694)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2012-03-05 03:01:38 UTC (rev 109695)
@@ -307,5 +307,5 @@
IF (SHARED_CORE)
SET_TARGET_PROPERTIES(${_javascript_Core_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
- INSTALL(TARGETS ${_javascript_Core_LIBRARY_NAME} DESTINATION lib)
+ INSTALL(TARGETS ${_javascript_Core_LIBRARY_NAME} DESTINATION "${LIB_INSTALL_DIR}")
ENDIF ()
Modified: trunk/Source/_javascript_Core/ChangeLog (109694 => 109695)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-05 02:43:37 UTC (rev 109694)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-05 03:01:38 UTC (rev 109695)
@@ -1,3 +1,12 @@
+2012-03-04 Raphael Kubo da Costa <[email protected]>
+
+ [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 <[email protected]>
Fix build when the classic interpreter is enabled
Modified: trunk/Source/WebCore/CMakeLists.txt (109694 => 109695)
--- trunk/Source/WebCore/CMakeLists.txt 2012-03-05 02:43:37 UTC (rev 109694)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-03-05 03:01:38 UTC (rev 109695)
@@ -2513,5 +2513,5 @@
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 ()
Modified: trunk/Source/WebCore/ChangeLog (109694 => 109695)
--- trunk/Source/WebCore/ChangeLog 2012-03-05 02:43:37 UTC (rev 109694)
+++ trunk/Source/WebCore/ChangeLog 2012-03-05 03:01:38 UTC (rev 109695)
@@ -1,3 +1,14 @@
+2012-03-04 Raphael Kubo da Costa <[email protected]>
+
+ [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 <[email protected]>
[EFL] Implementation of missing functions in GraphicsContext3DPrivate
Modified: trunk/Source/WebKit/CMakeLists.txt (109694 => 109695)
--- trunk/Source/WebKit/CMakeLists.txt 2012-03-05 02:43:37 UTC (rev 109694)
+++ trunk/Source/WebKit/CMakeLists.txt 2012-03-05 03:01:38 UTC (rev 109695)
@@ -84,4 +84,4 @@
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}")
Modified: trunk/Source/WebKit/ChangeLog (109694 => 109695)
--- trunk/Source/WebKit/ChangeLog 2012-03-05 02:43:37 UTC (rev 109694)
+++ trunk/Source/WebKit/ChangeLog 2012-03-05 03:01:38 UTC (rev 109695)
@@ -1,3 +1,12 @@
+2012-03-04 Raphael Kubo da Costa <[email protected]>
+
+ [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 <[email protected]>
[EFL][DRT] Implement setValueForUser and setAutofilled.
Modified: trunk/Source/WebKit2/CMakeLists.txt (109694 => 109695)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-03-05 02:43:37 UTC (rev 109694)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-03-05 03:01:38 UTC (rev 109695)
@@ -526,4 +526,4 @@
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}")
Modified: trunk/Source/WebKit2/ChangeLog (109694 => 109695)
--- trunk/Source/WebKit2/ChangeLog 2012-03-05 02:43:37 UTC (rev 109694)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-05 03:01:38 UTC (rev 109695)
@@ -1,3 +1,12 @@
+2012-03-04 Raphael Kubo da Costa <[email protected]>
+
+ [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 <[email protected]>
[Qt] Fix static_libs_as_shared build
Modified: trunk/Source/cmake/OptionsCommon.cmake (109694 => 109695)
--- trunk/Source/cmake/OptionsCommon.cmake 2012-03-05 02:43:37 UTC (rev 109694)
+++ trunk/Source/cmake/OptionsCommon.cmake 2012-03-05 03:01:38 UTC (rev 109695)
@@ -14,3 +14,7 @@
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})")
