[CMake] [GTK] Organize and clean up unused CMake variables
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 Apr 2015 16:20:34 +0000 (16:20 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 Apr 2015 16:20:34 +0000 (16:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=144364

Reviewed by Gyuyoung Kim.

.:

* Source/cmake/OptionsGTK.cmake: Remove unused variables and move variables
specific to certain projects into their PlatformGTK.cmake files.

Source/JavaScriptCore:

* PlatformGTK.cmake: Add variables specific to this project.

Source/WebCore:

* PlatformGTK.cmake: Add variables specific to this project.

Source/WebKit2:

* PlatformGTK.cmake: Add variables specific to this project.
* webkit2gtk-web-extension.pc.in: Hardcode the GTK+ API version. It rarely changes.
* webkit2gtk.pc.in: Ditto.

Source/WTF:

* wtf/PlatformGTK.cmake: Add variables specific to this project.

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

12 files changed:
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformGTK.cmake
Source/WTF/ChangeLog
Source/WTF/wtf/PlatformGTK.cmake
Source/WebCore/ChangeLog
Source/WebCore/PlatformGTK.cmake
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformGTK.cmake
Source/WebKit2/webkit2gtk-web-extension.pc.in
Source/WebKit2/webkit2gtk.pc.in
Source/cmake/OptionsGTK.cmake

index 67bc1f1..927af3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-04-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [CMake] [GTK] Organize and clean up unused CMake variables
+        https://bugs.webkit.org/show_bug.cgi?id=144364
+
+        Reviewed by Gyuyoung Kim.
+
+        * Source/cmake/OptionsGTK.cmake: Remove unused variables and move variables
+        specific to certain projects into their PlatformGTK.cmake files.
+
 2015-04-29  Ryuan Choi  <ryuan.choi@navercorp.com>
 
         [EFL] Build failure to find gio-unix
index 2777db7..e47b872 100644 (file)
@@ -1,3 +1,12 @@
+2015-04-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [CMake] [GTK] Organize and clean up unused CMake variables
+        https://bugs.webkit.org/show_bug.cgi?id=144364
+
+        Reviewed by Gyuyoung Kim.
+
+        * PlatformGTK.cmake: Add variables specific to this project.
+
 2015-04-28  Filip Pizlo  <fpizlo@apple.com>
 
         TypeOf should return SpecStringIdent and the DFG should know this
index 437ac78..c7d86e0 100644 (file)
@@ -1,3 +1,5 @@
+set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
+
 configure_file(javascriptcoregtk.pc.in ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-${WEBKITGTK_API_VERSION}.pc @ONLY)
 configure_file(JavaScriptCore.gir.in ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir @ONLY)
 
index 9a5f5d2..8aeeadc 100644 (file)
@@ -1,3 +1,12 @@
+2015-04-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [CMake] [GTK] Organize and clean up unused CMake variables
+        https://bugs.webkit.org/show_bug.cgi?id=144364
+
+        Reviewed by Gyuyoung Kim.
+
+        * wtf/PlatformGTK.cmake: Add variables specific to this project.
+
 2015-04-28  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Fully replace ENABLE_LLINT_C_LOOP with ENABLE_JIT
index a75f233..ebafef5 100644 (file)
@@ -1,3 +1,6 @@
+set(WTF_LIBRARY_TYPE STATIC)
+set(WTF_OUTPUT_NAME WTFGTK)
+
 list(APPEND WTF_SOURCES
     gobject/GMainLoopSource.cpp
     gobject/GRefPtr.cpp
index 23c6c1a..15e6efd 100644 (file)
@@ -1,3 +1,12 @@
+2015-04-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [CMake] [GTK] Organize and clean up unused CMake variables
+        https://bugs.webkit.org/show_bug.cgi?id=144364
+
+        Reviewed by Gyuyoung Kim.
+
+        * PlatformGTK.cmake: Add variables specific to this project.
+
 2015-04-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         REGRESSION(r182573): [GTK] The default context menu contains an empty item since r182573
index f306a9b..f77b3c5 100644 (file)
@@ -1,3 +1,5 @@
+set(WebCore_OUTPUT_NAME WebCoreGTK)
+
 list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/accessibility/atk"
     "${WEBCORE_DIR}/editing/atk"
index 122e9a0..25acd90 100644 (file)
@@ -1,3 +1,14 @@
+2015-04-29  Martin Robinson  <mrobinson@igalia.com>
+
+        [CMake] [GTK] Organize and clean up unused CMake variables
+        https://bugs.webkit.org/show_bug.cgi?id=144364
+
+        Reviewed by Gyuyoung Kim.
+
+        * PlatformGTK.cmake: Add variables specific to this project.
+        * webkit2gtk-web-extension.pc.in: Hardcode the GTK+ API version. It rarely changes.
+        * webkit2gtk.pc.in: Ditto.
+
 2015-04-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         REGRESSION(r182573): [GTK] The default context menu contains an empty item since r182573
index 485a9dd..86170fb 100644 (file)
@@ -1,3 +1,9 @@
+set(WebKit2_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION})
+set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
+set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
+set(WebKit2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
+set(WebKit2_DatabaseProcess_OUTPUT_NAME WebKitDatabaseProcess)
+
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
 file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR})
 file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_DIR})
index 1f41c79..ec4199a 100644 (file)
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: WebKit2WebExtension
 Description: WebKit web process extensions
 Version: @PROJECT_VERSION@
-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
+Requires: glib-2.0 gtk+-3.0 libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
 Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
 Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
index 5680e01..d35d59f 100644 (file)
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: WebKit2
 Description: Web content engine for GTK+
 Version: @PROJECT_VERSION@
-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
+Requires: glib-2.0 gtk+-3.0 libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@
 Libs: -L${libdir} -lwebkit2gtk-@WEBKITGTK_API_VERSION@
 Cflags: -I${includedir}/webkitgtk-@WEBKITGTK_API_VERSION@
index da3cb27..6bf82a2 100644 (file)
@@ -193,27 +193,11 @@ SET_AND_EXPOSE_TO_BUILD(MOZ_X11 ${ENABLE_X11_TARGET})
 SET_AND_EXPOSE_TO_BUILD(XP_UNIX ${WTF_OS_UNIX})
 SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_WAYLAND ${ENABLE_WAYLAND_TARGET})
 
+set(WTF_USE_UDIS86 ON)
 set(ENABLE_WEBKIT OFF)
 set(ENABLE_WEBKIT2 ON)
 set(ENABLE_PLUGIN_PROCESS ON)
 
-set(GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_6)
-set(GTK_API_VERSION 3.0)
-
-set(WTF_USE_SOUP 1)
-set(WTF_USE_UDIS86 1)
-
-set(WTF_LIBRARY_TYPE STATIC)
-set(WTF_OUTPUT_NAME WTFGTK)
-set(JavaScriptCore_OUTPUT_NAME javascriptcoregtk-${WEBKITGTK_API_VERSION})
-set(WebCore_OUTPUT_NAME WebCoreGTK)
-set(WebKit_OUTPUT_NAME webkitgtk-${WEBKITGTK_API_VERSION})
-set(WebKit2_OUTPUT_NAME webkit2gtk-${WEBKITGTK_API_VERSION})
-set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
-set(WebKit2_NetworkProcess_OUTPUT_NAME WebKitNetworkProcess)
-set(WebKit2_PluginProcess_OUTPUT_NAME WebKitPluginProcess)
-set(WebKit2_DatabaseProcess_OUTPUT_NAME WebKitDatabaseProcess)
-
 add_definitions(-DBUILDING_GTK__=1)
 add_definitions(-DGETTEXT_PACKAGE="WebKit2GTK-${WEBKITGTK_API_VERSION}")
 add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
@@ -394,8 +378,6 @@ if (USE_LIBNOTIFY)
     SET_AND_EXPOSE_TO_BUILD(WTF_USE_LIBNOTIFY TRUE)
 endif ()
 
-set(CPACK_SOURCE_GENERATOR TBZ2)
-
 set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
 set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
 set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)