Title: [123774] trunk/Source/WebKit2
- Revision
- 123774
- Author
- commit-qu...@webkit.org
- Date
- 2012-07-26 11:18:09 -0700 (Thu, 26 Jul 2012)
Log Message
[EFL][WK2] Regression(r123731): Linking errors due to efreet functions
https://bugs.webkit.org/show_bug.cgi?id=92378
Unreviewed build fix.
The library list created by PlatformEfl.cmake was being erased by a
SET called after including the platform specific file. Luckily the
dependencies were fulfilled by other targets until efreet was add.
Patch by Thiago Marcos P. Santos <thiago.san...@intel.com> on 2012-07-26
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (123773 => 123774)
--- trunk/Source/WebKit2/CMakeLists.txt 2012-07-26 18:16:54 UTC (rev 123773)
+++ trunk/Source/WebKit2/CMakeLists.txt 2012-07-26 18:18:09 UTC (rev 123774)
@@ -544,6 +544,10 @@
${WebKit2_LIBRARY_NAME}
)
+SET(WebKit2_LIBRARIES
+ ${WebCore_LIBRARY_NAME}
+)
+
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
# Create _javascript_ C++ code given an IDL input
@@ -560,10 +564,6 @@
LIST(APPEND WebKit2_SOURCES ${DERIVED_SOURCES_WEBKIT2_DIR}/${_name}MessageReceiver.cpp)
ENDFOREACH ()
-SET(WebKit2_LIBRARIES
- ${WebCore_LIBRARY_NAME}
-)
-
ADD_DEFINITIONS(-DBUILDING_WEBKIT)
INCLUDE_DIRECTORIES(${WebKit2_INCLUDE_DIRECTORIES})
ADD_LIBRARY(${WebKit2_LIBRARY_NAME} ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES})
Modified: trunk/Source/WebKit2/ChangeLog (123773 => 123774)
--- trunk/Source/WebKit2/ChangeLog 2012-07-26 18:16:54 UTC (rev 123773)
+++ trunk/Source/WebKit2/ChangeLog 2012-07-26 18:18:09 UTC (rev 123774)
@@ -1,3 +1,16 @@
+2012-07-26 Thiago Marcos P. Santos <thiago.san...@intel.com>
+
+ [EFL][WK2] Regression(r123731): Linking errors due to efreet functions
+ https://bugs.webkit.org/show_bug.cgi?id=92378
+
+ Unreviewed build fix.
+
+ The library list created by PlatformEfl.cmake was being erased by a
+ SET called after including the platform specific file. Luckily the
+ dependencies were fulfilled by other targets until efreet was add.
+
+ * CMakeLists.txt:
+
2012-07-26 Christophe Dumez <christophe.du...@intel.com>
[EFL][WK2] Compilation warning in EWK2UnitTestServer.cpp
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
