Title: [161095] trunk/Source
- Revision
- 161095
- Author
- [email protected]
- Date
- 2013-12-26 16:21:54 -0800 (Thu, 26 Dec 2013)
Log Message
Small build fix for the GTK+ CMake port
Source/WebKit/gtk:
* tests/CMakeLists.txt: Output the WebKit1 GObject API unit tests to the proper directory
and fix the path to the generated API source.
Source/WebKit2:
* UIProcess/API/gtk/tests/CMakeLists.txt: Make the way the output directory is specified similar
to the WebKit1 version of these tests, so that it is more difficult to inadvertently specify the
wrong directory.
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (161094 => 161095)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-12-26 23:01:22 UTC (rev 161094)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-12-27 00:21:54 UTC (rev 161095)
@@ -1,3 +1,10 @@
+2013-12-26 Martin Robinson <[email protected]>
+
+ Small build fix for the GTK+ CMake port
+
+ * tests/CMakeLists.txt: Output the WebKit1 GObject API unit tests to the proper directory
+ and fix the path to the generated API source.
+
2013-12-23 Martin Robinson <[email protected]>
[GTK] [CMake] Build the WebKit1 GObject API tests
Modified: trunk/Source/WebKit/gtk/tests/CMakeLists.txt (161094 => 161095)
--- trunk/Source/WebKit/gtk/tests/CMakeLists.txt 2013-12-26 23:01:22 UTC (rev 161094)
+++ trunk/Source/WebKit/gtk/tests/CMakeLists.txt 2013-12-27 00:21:54 UTC (rev 161095)
@@ -1,5 +1,3 @@
-set(TEST_BINARY_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests)
-
add_definitions(-DTEST_PLUGIN_DIR="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
include_directories(
${CMAKE_BINARY_DIR}
@@ -10,7 +8,7 @@
${CMAKE_SOURCE_DIR}/Source/WebCore/platform
${CMAKE_SOURCE_DIR}/Source/WTF
${DERIVED_SOURCES_DIR}
- ${DERIVED_SOURCES_DIR}/webkit
+ ${DERIVED_SOURCES_WEBKITGTK_DIR}
${GLIB_INCLUDE_DIRS}
${GTK3_INCLUDE_DIRS}
${LIBSOUP_INCLUDE_DIRS}
@@ -26,7 +24,7 @@
${LIBSOUP_LIBRARIES}
)
set_target_properties(${test_name} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY ${TEST_BINARY_DIR}/WebKit1GObjectAPITests
+ RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit1GObjectAPITests
)
endmacro()
Modified: trunk/Source/WebKit2/ChangeLog (161094 => 161095)
--- trunk/Source/WebKit2/ChangeLog 2013-12-26 23:01:22 UTC (rev 161094)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-27 00:21:54 UTC (rev 161095)
@@ -1,3 +1,11 @@
+2013-12-26 Martin Robinson <[email protected]>
+
+ Small build fix for the GTK+ CMake port
+
+ * UIProcess/API/gtk/tests/CMakeLists.txt: Make the way the output directory is specified similar
+ to the WebKit1 version of these tests, so that it is more difficult to inadvertently specify the
+ wrong directory.
+
2013-12-26 Thiago de Barros Lacerda <[email protected]>
[WK2][CoordinatedGraphics] Removing duplicate scale information from WebVIew.cpp
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt (161094 => 161095)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt 2013-12-26 23:01:22 UTC (rev 161094)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt 2013-12-27 00:21:54 UTC (rev 161095)
@@ -1,4 +1,3 @@
-set(TEST_BINARY_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests)
set(TEST_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests)
set(TEST_RESOURCES_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/resources)
file(MAKE_DIRECTORY ${TEST_RESOURCES_DIR})
@@ -69,7 +68,7 @@
${LIBSOUP_LIBRARIES}
)
set_target_properties(${test_name} PROPERTIES
- RUNTIME_OUTPUT_DIRECTORY ${TEST_BINARY_DIR}
+ RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests
)
endmacro()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
