Changeset 160993 in webkit

Timestamp:

Dec 23, 2013 5:35:00 AM (10 years ago)

Author:

Gustavo Noronha Silva

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/JavaScriptCore:

• PlatformGTK.cmake: Added. Generate javascriptcoregtk-3.0.pc.

Source/WebKit:

• PlatformGTK.cmake: generate webkitgtk-3.0.pc.

Source/WebKit2:

• PlatformGTK.cmake: generate webkit2gtk.pc.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/PlatformGTK.cmake (added)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/PlatformGTK.cmake (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/PlatformGTK.cmake (modified) (1 diff)
• Source/cmake/OptionsGTK.cmake (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2013-12-23  Gustavo Noronha Silva  <gns@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  <cgarcia@igalia.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-12-23  Gustavo Noronha Silva  <gns@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 javascriptcoregtk-3.0.pc.
+
 2013-12-22  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2013-12-23  Gustavo Noronha Silva  <gns@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  <mrobinson@igalia.com>
 

trunk/Source/WebKit/PlatformGTK.cmake

@@ -2 +2 @@
 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}")
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-23  Gustavo Noronha Silva  <gns@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  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -9 +9 @@
 
 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)

trunk/Source/cmake/OptionsGTK.cmake

@@ -60 +60 @@
 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})
 
@@ -68 +68 @@
 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)