Changeset 161093 in webkit

Timestamp:

Dec 26, 2013 1:24:51 PM (10 years ago)

Author:

Martin Robinson

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.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/PlatformGTK.cmake (modified) (2 diffs)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/PlatformGTK.cmake

@@ +1 @@
+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"
@@ -38 +47 @@
     add_dependencies(fake-docs-target WebKit2)
 endif ()
-

trunk/Source/cmake/OptionsGTK.cmake

@@ -79 +79 @@
     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()