Title: [170052] trunk
- Revision
- 170052
- Author
- [email protected]
- Date
- 2014-06-17 02:58:20 -0700 (Tue, 17 Jun 2014)
Log Message
Remove the USE_GTK2=1 branch in OptionsGTK.cmake. This used to determine
GTK+ and GDK libraries and include directories for the GTK+ 2 dependency,
but we now only support GTK+ 3. The GTK+ 2 dependency is still required
by the plugin process, but it is searched and utilized separately.
Rubber-stamped by Carlos Garcia Campos.
* Source/cmake/OptionsGTK.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (170051 => 170052)
--- trunk/ChangeLog 2014-06-17 07:49:10 UTC (rev 170051)
+++ trunk/ChangeLog 2014-06-17 09:58:20 UTC (rev 170052)
@@ -1,3 +1,14 @@
+2014-06-17 Zan Dobersek <[email protected]>
+
+ Remove the USE_GTK2=1 branch in OptionsGTK.cmake. This used to determine
+ GTK+ and GDK libraries and include directories for the GTK+ 2 dependency,
+ but we now only support GTK+ 3. The GTK+ 2 dependency is still required
+ by the plugin process, but it is searched and utilized separately.
+
+ Rubber-stamped by Carlos Garcia Campos.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2014-06-16 Commit Queue <[email protected]>
Unreviewed, rolling out r170003.
Modified: trunk/Source/cmake/OptionsGTK.cmake (170051 => 170052)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-06-17 07:49:10 UTC (rev 170051)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-06-17 09:58:20 UTC (rev 170052)
@@ -167,21 +167,12 @@
find_package(ATSPI 2.5.3)
find_package(GObjectIntrospection)
-if (NOT USE_GTK2)
- find_package(GTK3 3.6.0 REQUIRED)
- find_package(GDK3 3.6.0 REQUIRED)
- set(GTK_LIBRARIES ${GTK3_LIBRARIES})
- set(GTK_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS})
- set(GDK_LIBRARIES ${GDK3_LIBRARIES})
- set(GDK_INCLUDE_DIRS ${GDK3_INCLUDE_DIRS})
-else ()
- set(GTK_LIBRARIES ${GTK2_LIBRARIES})
- set(GTK_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS})
- set(GDK_LIBRARIES ${GDK2_LIBRARIES})
- set(GDK_INCLUDE_DIRS ${GDK2_INCLUDE_DIRS})
- add_definitions(-DGTK_API_VERSION_2)
- add_definitions(-DWEBKITGTK_API_VERSION_STRING="2.0")
-endif ()
+find_package(GTK3 3.6.0 REQUIRED)
+find_package(GDK3 3.6.0 REQUIRED)
+set(GTK_LIBRARIES ${GTK3_LIBRARIES})
+set(GTK_INCLUDE_DIRS ${GTK3_INCLUDE_DIRS})
+set(GDK_LIBRARIES ${GDK3_LIBRARIES})
+set(GDK_INCLUDE_DIRS ${GDK3_INCLUDE_DIRS})
set(glib_components gio gobject gthread gmodule)
if (ENABLE_GAMEPAD)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
