Title: [109197] trunk
- Revision
- 109197
- Author
- [email protected]
- Date
- 2012-02-28 22:49:07 -0800 (Tue, 28 Feb 2012)
Log Message
[CMake] Always build wtf as a static library.
https://bugs.webkit.org/show_bug.cgi?id=79857
Reviewed by Eric Seidel.
.:
* CMakeLists.txt: Put static libraries in ${CMAKE_BINARY_DIR} too
to have them grouped with the shared ones.
Source/_javascript_Core:
To help the efforts in bug 75673 to move WTF out of
_javascript_Core, act more like the other ports and remove the
possibility of building WTF as a shared library.
It does not make much sense to, for example, ship WTF as a
separate .so with webkit-efl packages, and it should be small
enough not to cause problems during linking.
* wtf/CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (109196 => 109197)
--- trunk/CMakeLists.txt 2012-02-29 06:40:35 UTC (rev 109196)
+++ trunk/CMakeLists.txt 2012-02-29 06:49:07 UTC (rev 109197)
@@ -42,6 +42,7 @@
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@@ -119,14 +120,12 @@
# -----------------------------------------------------------------------------
# Default library types
# -----------------------------------------------------------------------------
-OPTION(SHARED_CORE "build WTF, _javascript_Core and WebCore as shared libraries")
+OPTION(SHARED_CORE "build _javascript_Core and WebCore as shared libraries")
IF (SHARED_CORE)
- SET(WTF_LIBRARY_TYPE SHARED)
SET(_javascript_Core_LIBRARY_TYPE SHARED)
SET(WebCore_LIBRARY_TYPE SHARED)
ELSE ()
- SET(WTF_LIBRARY_TYPE STATIC)
SET(_javascript_Core_LIBRARY_TYPE STATIC)
SET(WebCore_LIBRARY_TYPE STATIC)
ENDIF ()
Modified: trunk/ChangeLog (109196 => 109197)
--- trunk/ChangeLog 2012-02-29 06:40:35 UTC (rev 109196)
+++ trunk/ChangeLog 2012-02-29 06:49:07 UTC (rev 109197)
@@ -1,3 +1,13 @@
+2012-02-28 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Always build wtf as a static library.
+ https://bugs.webkit.org/show_bug.cgi?id=79857
+
+ Reviewed by Eric Seidel.
+
+ * CMakeLists.txt: Put static libraries in ${CMAKE_BINARY_DIR} too
+ to have them grouped with the shared ones.
+
2012-02-28 Ryosuke Niwa <[email protected]>
perf-o-matic: generate dashboard images using Google Chart Tools
Modified: trunk/Source/_javascript_Core/ChangeLog (109196 => 109197)
--- trunk/Source/_javascript_Core/ChangeLog 2012-02-29 06:40:35 UTC (rev 109196)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-02-29 06:49:07 UTC (rev 109197)
@@ -1,3 +1,20 @@
+2012-02-28 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Always build wtf as a static library.
+ https://bugs.webkit.org/show_bug.cgi?id=79857
+
+ Reviewed by Eric Seidel.
+
+ To help the efforts in bug 75673 to move WTF out of
+ _javascript_Core, act more like the other ports and remove the
+ possibility of building WTF as a shared library.
+
+ It does not make much sense to, for example, ship WTF as a
+ separate .so with webkit-efl packages, and it should be small
+ enough not to cause problems during linking.
+
+ * wtf/CMakeLists.txt:
+
2012-02-28 Dmitry Lomov <[email protected]>
[JSC] Implement ArrayBuffer transfer
Modified: trunk/Source/_javascript_Core/wtf/CMakeLists.txt (109196 => 109197)
--- trunk/Source/_javascript_Core/wtf/CMakeLists.txt 2012-02-29 06:40:35 UTC (rev 109196)
+++ trunk/Source/_javascript_Core/wtf/CMakeLists.txt 2012-02-29 06:49:07 UTC (rev 109197)
@@ -206,14 +206,9 @@
WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
INCLUDE_DIRECTORIES(${WTF_INCLUDE_DIRECTORIES})
ADD_DEFINITIONS(-DBUILDING_WTF)
-ADD_LIBRARY(${WTF_LIBRARY_NAME} ${WTF_LIBRARY_TYPE} ${WTF_HEADERS} ${WTF_SOURCES})
+ADD_LIBRARY(${WTF_LIBRARY_NAME} STATIC ${WTF_HEADERS} ${WTF_SOURCES})
TARGET_LINK_LIBRARIES(${WTF_LIBRARY_NAME} ${WTF_LIBRARIES})
IF (WTF_LINK_FLAGS)
ADD_TARGET_PROPERTIES(${WTF_LIBRARY_NAME} LINK_FLAGS "${WTF_LINK_FLAGS}")
ENDIF ()
-
-IF (SHARED_CORE)
- SET_TARGET_PROPERTIES(${WTF_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
- INSTALL(TARGETS ${WTF_LIBRARY_NAME} DESTINATION lib)
-ENDIF ()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
