[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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@161093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index bc7eb572ce169d1d19444d9f736dc92135ab5e7c..e8d93171f6c7704e1c234d2d6f3ea96248cb293d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-12-26  Martin Robinson  <mrobinson@igalia.com>
+
+        [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  <mrobinson@igalia.com>
 
         [GTK] [CMake] Properly name the JavaScriptCore library

diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
index 686fb3e6fe936585a915142e24375bddf3041a5d..faaac7c85c99965337cd939add0b84113014325a 100644 (file)
--- a/Source/PlatformGTK.cmake
+++ b/Source/PlatformGTK.cmake
@@ -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 @@ endif ()
 if (ENABLE_WEBKIT2)
     add_dependencies(fake-docs-target WebKit2)
 endif ()
-

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index e1b95f84b1a624f805cd28daedee1aec16cba03c..d759ac7b541770e3ca192b78c58e1c44d0ba0f8d 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -78,6 +78,16 @@ if (NOT ENABLE_VIDEO AND ENABLE_VIDEO_TRACK)
     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