Title: [161093] trunk
- Revision
- 161093
- Author
- [email protected]
- Date
- 2013-12-26 13:24:51 -0800 (Thu, 26 Dec 2013)
Log Message
[GTK] [CMake] Add a production build type
https://bugs.webkit.org/show_bug.cgi?id=126179
Reviewed by Daniel Bates.
* Source/PlatformGTK.cmake: When the API tests are enabled compile the WebKit GObject
API unit tests. The inclusion of these build files was inadvertently removed in an earlier
patch.
* Source/cmake/OptionsGTK.cmake: When in production mode turn off all tools and tests and
use the autotools linker script.
Modified Paths
Diff
Modified: trunk/ChangeLog (161092 => 161093)
--- trunk/ChangeLog 2013-12-26 19:20:22 UTC (rev 161092)
+++ trunk/ChangeLog 2013-12-26 21:24:51 UTC (rev 161093)
@@ -1,3 +1,16 @@
+2013-12-26 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Add a production build type
+ https://bugs.webkit.org/show_bug.cgi?id=126179
+
+ Reviewed by Daniel Bates.
+
+ * Source/PlatformGTK.cmake: When the API tests are enabled compile the WebKit GObject
+ API unit tests. The inclusion of these build files was inadvertently removed in an earlier
+ patch.
+ * Source/cmake/OptionsGTK.cmake: When in production mode turn off all tools and tests and
+ use the autotools linker script.
+
2013-12-25 Martin Robinson <[email protected]>
[GTK] [CMake] Properly name the _javascript_Core library
Modified: trunk/Source/PlatformGTK.cmake (161092 => 161093)
--- trunk/Source/PlatformGTK.cmake 2013-12-26 19:20:22 UTC (rev 161092)
+++ trunk/Source/PlatformGTK.cmake 2013-12-26 21:24:51 UTC (rev 161093)
@@ -1,3 +1,12 @@
+if (ENABLE_API_TESTS)
+ if (ENABLE_WEBKIT)
+ add_subdirectory(${WEBKIT_DIR}/gtk/tests)
+ endif ()
+ if (ENABLE_WEBKIT2)
+ add_subdirectory(${WEBKIT2_DIR}/UIProcess/API/gtk/tests)
+ endif ()
+endif ()
+
set(DocumentationDependencies
"${CMAKE_SOURCE_DIR}/Source/WebKit/gtk/docs/webkitenvironment.xml"
)
@@ -37,4 +46,3 @@
if (ENABLE_WEBKIT2)
add_dependencies(fake-docs-target WebKit2)
endif ()
-
Modified: trunk/Source/cmake/OptionsGTK.cmake (161092 => 161093)
--- trunk/Source/cmake/OptionsGTK.cmake 2013-12-26 19:20:22 UTC (rev 161092)
+++ trunk/Source/cmake/OptionsGTK.cmake 2013-12-26 21:24:51 UTC (rev 161093)
@@ -78,6 +78,16 @@
message(STATUS "Disabling VIDEO_TRACK since VIDEO support is disabled.")
set(ENABLE_VIDEO_TRACK OFF)
endif ()
+
+if (PRODUCTION_MODE)
+ set(ENABLE_TOOLS OFF)
+ set(ENABLE_API_TESTS OFF)
+ set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/autotools/symbols.filter")
+else ()
+ set(ENABLE_TOOLS ON)
+ set(ENABLE_API_TESTS ON)
+endif ()
+
WEBKIT_OPTION_END()
# These are used to generate the pkg-config files, note we only support GTK 3.0
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
