Title: [131633] trunk/Source/WebCore
- Revision
- 131633
- Author
- [email protected]
- Date
- 2012-10-17 13:21:27 -0700 (Wed, 17 Oct 2012)
Log Message
[CMake] Set WebCore_LIBRARIES earlier.
https://bugs.webkit.org/show_bug.cgi?id=99630
Reviewed by Rob Buis.
* CMakeLists.txt: Follow the style we use in other CMakeList.txt
files and set the Foo_LIBRARIES variables before we start checking
for optional features, as they might append other libraries to the
list (it already happens with WTF_USE_3D_GRAPHICS, for example).
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (131632 => 131633)
--- trunk/Source/WebCore/CMakeLists.txt 2012-10-17 20:12:16 UTC (rev 131632)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-10-17 20:21:27 UTC (rev 131633)
@@ -2493,6 +2493,11 @@
${WEBCORE_DIR}/css/view-source.css
)
+SET(WebCore_LIBRARIES
+ ${WTF_LIBRARY_NAME}
+ ${_javascript_Core_LIBRARY_NAME}
+)
+
IF (ENABLE_SQL_DATABASE AND ENABLE_WORKERS)
LIST(APPEND WebCore_SOURCES
Modules/webdatabase/WorkerContextWebDatabase.cpp
@@ -2723,7 +2728,6 @@
INCLUDE(${WEBCORE_DIR}/UseJSC.cmake)
-SET(WebCore_LIBRARIES ${WTF_LIBRARY_NAME} ${_javascript_Core_LIBRARY_NAME})
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
# ANGLE tokenizer & parser
Modified: trunk/Source/WebCore/ChangeLog (131632 => 131633)
--- trunk/Source/WebCore/ChangeLog 2012-10-17 20:12:16 UTC (rev 131632)
+++ trunk/Source/WebCore/ChangeLog 2012-10-17 20:21:27 UTC (rev 131633)
@@ -1,3 +1,15 @@
+2012-10-17 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Set WebCore_LIBRARIES earlier.
+ https://bugs.webkit.org/show_bug.cgi?id=99630
+
+ Reviewed by Rob Buis.
+
+ * CMakeLists.txt: Follow the style we use in other CMakeList.txt
+ files and set the Foo_LIBRARIES variables before we start checking
+ for optional features, as they might append other libraries to the
+ list (it already happens with WTF_USE_3D_GRAPHICS, for example).
+
2012-10-17 Philip Rogers <[email protected]>
Allow lazy initialization of SVG XML animated properties.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
