Title: [160993] trunk
- Revision
- 160993
- Author
- g...@gnome.org
- Date
- 2013-12-23 05:35:00 -0800 (Mon, 23 Dec 2013)
Log Message
[GTK] [CMake] Generate pkg-config files
https://bugs.webkit.org/show_bug.cgi?id=125685
Reviewed by Martin Robinson.
.:
* Source/cmake/OptionsGTK.cmake: set variables used for filling in the values in the
pkg-config files.
Source/_javascript_Core:
* PlatformGTK.cmake: Added. Generate _javascript_coregtk-3.0.pc.
Source/WebKit:
* PlatformGTK.cmake: generate webkitgtk-3.0.pc.
Source/WebKit2:
* PlatformGTK.cmake: generate webkit2gtk.pc.
Modified Paths
Added Paths
Diff
Modified: trunk/ChangeLog (160992 => 160993)
--- trunk/ChangeLog 2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/ChangeLog 2013-12-23 13:35:00 UTC (rev 160993)
@@ -1,3 +1,13 @@
+2013-12-23 Gustavo Noronha Silva <g...@gnome.org>
+
+ [GTK] [CMake] Generate pkg-config files
+ https://bugs.webkit.org/show_bug.cgi?id=125685
+
+ Reviewed by Martin Robinson.
+
+ * Source/cmake/OptionsGTK.cmake: set variables used for filling in the values in the
+ pkg-config files.
+
2013-12-23 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Build with network process unconditionally
Modified: trunk/Source/_javascript_Core/ChangeLog (160992 => 160993)
--- trunk/Source/_javascript_Core/ChangeLog 2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-12-23 13:35:00 UTC (rev 160993)
@@ -1,3 +1,12 @@
+2013-12-23 Gustavo Noronha Silva <g...@gnome.org>
+
+ [GTK] [CMake] Generate pkg-config files
+ https://bugs.webkit.org/show_bug.cgi?id=125685
+
+ Reviewed by Martin Robinson.
+
+ * PlatformGTK.cmake: Added. Generate _javascript_coregtk-3.0.pc.
+
2013-12-22 Benjamin Poulain <benja...@webkit.org>
Create a skeleton for CSS Selector code generation
Added: trunk/Source/_javascript_Core/PlatformGTK.cmake (0 => 160993)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake (rev 0)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2013-12-23 13:35:00 UTC (rev 160993)
@@ -0,0 +1,2 @@
+configure_file(_javascript_coregtk.pc.in ${CMAKE_BINARY_DIR}/Source/_javascript_Core/_javascript_coregtk-3.0.pc @ONLY)
+
Modified: trunk/Source/WebKit/ChangeLog (160992 => 160993)
--- trunk/Source/WebKit/ChangeLog 2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/WebKit/ChangeLog 2013-12-23 13:35:00 UTC (rev 160993)
@@ -1,3 +1,12 @@
+2013-12-23 Gustavo Noronha Silva <g...@gnome.org>
+
+ [GTK] [CMake] Generate pkg-config files
+ https://bugs.webkit.org/show_bug.cgi?id=125685
+
+ Reviewed by Martin Robinson.
+
+ * PlatformGTK.cmake: generate webkitgtk-3.0.pc.
+
2013-12-22 Martin Robinson <mrobin...@igalia.com>
Small build fix for GTK+ with the CMake build
Modified: trunk/Source/WebKit/PlatformGTK.cmake (160992 => 160993)
--- trunk/Source/WebKit/PlatformGTK.cmake 2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2013-12-23 13:35:00 UTC (rev 160993)
@@ -1,6 +1,8 @@
set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkit)
file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITGTK_DIR})
configure_file(gtk/webkit/webkitversion.h.in ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitversion.h)
+configure_file(gtk/webkit.pc.in ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-3.0.pc @ONLY)
+
add_definitions(-DPACKAGE_LOCALE_DIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
list(APPEND WebKit_INCLUDE_DIRECTORIES
Modified: trunk/Source/WebKit2/ChangeLog (160992 => 160993)
--- trunk/Source/WebKit2/ChangeLog 2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-23 13:35:00 UTC (rev 160993)
@@ -1,3 +1,12 @@
+2013-12-23 Gustavo Noronha Silva <g...@gnome.org>
+
+ [GTK] [CMake] Generate pkg-config files
+ https://bugs.webkit.org/show_bug.cgi?id=125685
+
+ Reviewed by Martin Robinson.
+
+ * PlatformGTK.cmake: generate webkit2gtk.pc.
+
2013-12-23 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Build with network process unconditionally
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (160992 => 160993)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-23 13:35:00 UTC (rev 160993)
@@ -8,6 +8,7 @@
file(MAKE_DIRECTORY ${WEBKIT2_FORWARDING_HEADERS_DIR})
configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${WEBKIT2_BUILT_API_DIR}/WebKitVersion.h)
+configure_file(webkit2gtk.pc.in ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-3.0.pc @ONLY)
add_definitions(-DWEBKIT2_COMPILATION)
add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIBEXECDIR}")
Modified: trunk/Source/cmake/OptionsGTK.cmake (160992 => 160993)
--- trunk/Source/cmake/OptionsGTK.cmake 2013-12-23 13:15:07 UTC (rev 160992)
+++ trunk/Source/cmake/OptionsGTK.cmake 2013-12-23 13:35:00 UTC (rev 160993)
@@ -59,15 +59,25 @@
endif ()
WEBKIT_OPTION_END()
-set(PROJECT_VERSION_MAJOR 0)
-set(PROJECT_VERSION_MINOR 1)
-set(PROJECT_VERSION_PATCH 0)
+set(PROJECT_VERSION_MAJOR 2)
+set(PROJECT_VERSION_MINOR 3)
+set(PROJECT_VERSION_PATCH 3)
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
set(WEBKIT_MICRO_VERSION ${PROJECT_VERSION_PATCH})
set(WEBKIT_MINOR_VERSION ${PROJECT_VERSION_MINOR})
set(WEBKIT_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
+# These are used to generate the pkg-config files, note we only support GTK 3.0
+# builds with cmake.
+set(WEBKITGTK_API_VERSION 3.0)
+set(GTK_API_VERSION 3.0)
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+set(libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}")
+set(includedir "${prefix}/include")
+set(VERSION ${PROJECT_VERSION})
+
set(ENABLE_WEBCORE ON)
set(ENABLE_INSPECTOR ON)
set(ENABLE_PLUGIN_PROCESS ON)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
