Diff
Modified: trunk/ChangeLog (125442 => 125443)
--- trunk/ChangeLog 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/ChangeLog 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,3 +1,27 @@
+2012-08-13 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Remove glib-related Find modules and write single new one instead.
+ https://bugs.webkit.org/show_bug.cgi?id=93786
+
+ Reviewed by Rob Buis.
+
+ As part of the ongoing effort to write proper Find modules that use
+ absolute include and library paths instead of the short ones from
+ pkg-config, replace Find{GIO,Glib,Gthread}.cmake with a single
+ FindGLIB.cmake that optionally detects components such as GIO and
+ GObject.
+
+ Library paths are now defined as "/full/path/to/libfoo.so" instead of
+ simply "foo", so that the linker receives a full path and we can then
+ avoid accidentally picking up a libfoo.so installed into /usr/lib
+ instead of a local one built with jhbuild.
+
+ * Source/cmake/FindGIO.cmake: Removed.
+ * Source/cmake/FindGLIB.cmake: Added.
+ * Source/cmake/FindGlib.cmake: Removed.
+ * Source/cmake/FindGthread.cmake: Removed.
+ * Source/cmake/OptionsEfl.cmake: Look for GLIB with the GIO component.
+
2012-08-13 Zan Dobersek <[email protected]>
[Gtk] Remove SVG_FEATURES and HTML_FEATURES from Source/WebCore/GNUmakefile.am
Modified: trunk/Source/_javascript_Core/ChangeLog (125442 => 125443)
--- trunk/Source/_javascript_Core/ChangeLog 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,3 +1,12 @@
+2012-08-13 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Remove glib-related Find modules and write single new one instead.
+ https://bugs.webkit.org/show_bug.cgi?id=93786
+
+ Reviewed by Rob Buis.
+
+ * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*.
+
2012-08-12 Allan Sandfeld Jensen <[email protected]>
Doesn't build with ENABLE_JIT=0
Modified: trunk/Source/_javascript_Core/shell/PlatformEfl.cmake (125442 => 125443)
--- trunk/Source/_javascript_Core/shell/PlatformEfl.cmake 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/_javascript_Core/shell/PlatformEfl.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,5 +1,5 @@
LIST(APPEND JSC_LIBRARIES
- ${Glib_LIBRARIES}
+ ${GLIB_LIBRARIES}
${ECORE_LIBRARIES}
${CMAKE_DL_LIBS}
)
Modified: trunk/Source/WTF/ChangeLog (125442 => 125443)
--- trunk/Source/WTF/ChangeLog 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/WTF/ChangeLog 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,3 +1,12 @@
+2012-08-13 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Remove glib-related Find modules and write single new one instead.
+ https://bugs.webkit.org/show_bug.cgi?id=93786
+
+ Reviewed by Rob Buis.
+
+ * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it.
+
2012-08-11 Sam Weinig <[email protected]>
Enable XPC Service based WebProcess with runtime flag
Modified: trunk/Source/WTF/wtf/PlatformEfl.cmake (125442 => 125443)
--- trunk/Source/WTF/wtf/PlatformEfl.cmake 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/WTF/wtf/PlatformEfl.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -13,7 +13,8 @@
LIST(APPEND WTF_LIBRARIES
pthread
- ${Glib_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GLIB_GIO_LIBRARIES}
${ICU_LIBRARIES}
${ICU_I18N_LIBRARIES}
${ECORE_LIBRARIES}
@@ -33,7 +34,7 @@
${ECORE_INCLUDE_DIRS}
${ECORE_EVAS_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
- ${Glib_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
${ICU_INCLUDE_DIRS}
${_javascript_CORE_DIR}/wtf/gobject
${_javascript_CORE_DIR}/wtf/unicode/
Modified: trunk/Source/WebCore/ChangeLog (125442 => 125443)
--- trunk/Source/WebCore/ChangeLog 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/WebCore/ChangeLog 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,3 +1,16 @@
+2012-08-13 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Remove glib-related Find modules and write single new one instead.
+ https://bugs.webkit.org/show_bug.cgi?id=93786
+
+ Reviewed by Rob Buis.
+
+ No new tests, build system plumbing.
+
+ * PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link
+ directly against GIO, as code in the soup network backend uses
+ that.
+
2012-08-13 Simon Hausmann <[email protected]>
[Qt] Simplify storage and reduce size of QtConnectionObject
Modified: trunk/Source/WebCore/PlatformEfl.cmake (125442 => 125443)
--- trunk/Source/WebCore/PlatformEfl.cmake 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -222,7 +222,8 @@
${LIBXSLT_LIBRARIES}
${PNG_LIBRARY}
${SQLITE_LIBRARIES}
- ${Glib_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GLIB_GIO_LIBRARIES}
${LIBSOUP24_LIBRARIES}
${ZLIB_LIBRARIES}
)
@@ -237,7 +238,7 @@
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
- ${Glib_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
${LIBSOUP24_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
Modified: trunk/Source/WebKit/ChangeLog (125442 => 125443)
--- trunk/Source/WebKit/ChangeLog 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/WebKit/ChangeLog 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,3 +1,12 @@
+2012-08-13 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Remove glib-related Find modules and write single new one instead.
+ https://bugs.webkit.org/show_bug.cgi?id=93786
+
+ Reviewed by Rob Buis.
+
+ * PlatformEfl.cmake: Use GLIB_* instead of Glib_*.
+
2012-08-12 Loïc Yhuel <[email protected]>
[Qt] Make it possible to build without QtTest/QtPrintSupport
Modified: trunk/Source/WebKit/PlatformEfl.cmake (125442 => 125443)
--- trunk/Source/WebKit/PlatformEfl.cmake 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -26,7 +26,7 @@
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
- ${Glib_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
${LIBSOUP24_INCLUDE_DIRS}
)
@@ -159,7 +159,7 @@
${PNG_LIBRARY}
${JPEG_LIBRARY}
${CMAKE_DL_LIBS}
- ${Glib_LIBRARIES}
+ ${GLIB_LIBRARIES}
${LIBSOUP24_LIBRARIES}
)
@@ -324,8 +324,8 @@
IF (ENABLE_GLIB_SUPPORT)
LIST(APPEND EWKUnitTests_INCLUDE_DIRECTORIES "${WTF_DIR}/wtf/gobject")
LIST(APPEND EWKUnitTests_LIBRARIES
- ${Glib_LIBRARIES}
- ${Gthread_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GLIB_GTHREAD_LIBRARIES}
)
ENDIF ()
Modified: trunk/Source/WebKit2/ChangeLog (125442 => 125443)
--- trunk/Source/WebKit2/ChangeLog 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,3 +1,12 @@
+2012-08-13 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Remove glib-related Find modules and write single new one instead.
+ https://bugs.webkit.org/show_bug.cgi?id=93786
+
+ Reviewed by Rob Buis.
+
+ * PlatformEfl.cmake: Use GLIB_* instead of Glib_*.
+
2012-08-13 Christophe Dumez <[email protected]>
[SOUP][WK2] Missing LocalTerminationDisabler in WebCookieManager::setCookiePersistentStorage()
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (125442 => 125443)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -142,7 +142,7 @@
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIRS}
${SQLITE_INCLUDE_DIRS}
- ${Glib_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
${LIBSOUP24_INCLUDE_DIRS}
${WTF_DIR}
)
@@ -160,7 +160,7 @@
${PNG_LIBRARY}
${JPEG_LIBRARY}
${CMAKE_DL_LIBS}
- ${Glib_LIBRARIES}
+ ${GLIB_LIBRARIES}
${LIBSOUP24_LIBRARIES}
)
@@ -233,8 +233,8 @@
IF (ENABLE_GLIB_SUPPORT)
LIST(APPEND EWK2UnitTests_LIBRARIES
- ${Glib_LIBRARIES}
- ${Gthread_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GLIB_GTHREAD_LIBRARIES}
)
ENDIF()
Deleted: trunk/Source/cmake/FindGIO.cmake (125442 => 125443)
--- trunk/Source/cmake/FindGIO.cmake 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/cmake/FindGIO.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,27 +0,0 @@
-# - Try to find GIO 2.0
-# Once done, this will define
-#
-# GIO_FOUND - system has GIO
-# GIO_INCLUDE_DIRS - the GIO include directories
-# GIO_LIBRARIES - link these to use GIO
-
-include(LibFindMacros)
-
-# Dependencies
-libfind_package(GIO Glib)
-
-# Use pkg-config to get hints about paths
-libfind_pkg_check_modules(GIO_PKGCONF gio-2.0)
-
-# Find the library
-find_library(GIO_LIBRARY
- NAMES gio-2.0
- PATHS ${GIO_PKGCONF_LIBRARY_DIRS}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(GIO_PROCESS_INCLUDES Glib_INCLUDE_DIRS)
-set(GIO_PROCESS_LIBS GIO_LIBRARY Glib_LIBRARIES)
-libfind_process(GIO)
-
Added: trunk/Source/cmake/FindGLIB.cmake (0 => 125443)
--- trunk/Source/cmake/FindGLIB.cmake (rev 0)
+++ trunk/Source/cmake/FindGLIB.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -0,0 +1,102 @@
+# - Try to find Glib and its components (gio, gobject etc)
+# Once done, this will define
+#
+# GLIB_FOUND - system has Glib
+# GLIB_INCLUDE_DIRS - the Glib include directories
+# GLIB_LIBRARIES - link these to use Glib
+#
+# Optionally, the COMPONENTS keyword can be passed to FIND_PACKAGE()
+# and Glib components can be looked for. Currently, the following
+# components can be used, and they define the following variables if
+# found:
+#
+# gio: GLIB_GIO_LIBRARIES
+# gobject: GLIB_GOBJECT_LIBRARIES
+# gmodule: GLIB_GMODULE_LIBRARIES
+# gthread: GLIB_GTHREAD_LIBRARIES
+#
+# Note that the respective _INCLUDE_DIR variables are not set, since
+# all headers are in the same directory as GLIB_INCLUDE_DIRS.
+#
+# Copyright (C) 2012 Raphael Kubo da Costa <[email protected]>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+FIND_PACKAGE(PkgConfig)
+PKG_CHECK_MODULES(PC_GLIB QUIET glib-2.0)
+
+FIND_LIBRARY(GLIB_LIBRARIES
+ NAMES glib-2.0
+ HINTS ${PC_GLIB_LIBDIR}
+ ${PC_GLIB_LIBRARY_DIRS}
+)
+
+# Files in glib's main include path may include glibconfig.h, which,
+# for some odd reason, is normally in $LIBDIR/glib-2.0/include.
+GET_FILENAME_COMPONENT(_GLIB_LIBRARY_DIR ${GLIB_LIBRARIES} PATH)
+FIND_PATH(GLIBCONFIG_INCLUDE_DIR
+ NAMES glibconfig.h
+ HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${_GLIB_LIBRARY_DIR}
+ PATH_SUFFIXES glib-2.0/include
+)
+
+FIND_PATH(GLIB_INCLUDE_DIR
+ NAMES glib.h
+ HINTS ${PC_GLIB_INCLUDEDIR}
+ ${PC_GLIB_INCLUDE_DIRS}
+ PATH_SUFFIXES glib-2.0
+)
+
+SET(GLIB_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR})
+
+# Version detection
+FILE(READ "${GLIBCONFIG_INCLUDE_DIR}/glibconfig.h" GLIBCONFIG_H_CONTENTS)
+STRING(REGEX MATCH "#define GLIB_MAJOR_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
+SET(GLIB_VERSION_MAJOR "${CMAKE_MATCH_1}")
+STRING(REGEX MATCH "#define GLIB_MINOR_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
+SET(GLIB_VERSION_MINOR "${CMAKE_MATCH_1}")
+STRING(REGEX MATCH "#define GLIB_MICRO_VERSION ([0-9]+)" _dummy "${GLIBCONFIG_H_CONTENTS}")
+SET(GLIB_VERSION_MICRO "${CMAKE_MATCH_1}")
+SET(GLIB_VERSION "${GLIB_VERSION_MAJOR}.${GLIB_VERSION_MINOR}.${GLIB_VERSION_MICRO}")
+
+# Additional Glib components. We only look for libraries, as not all of them
+# have corresponding headers and all headers are installed alongside the main
+# glib ones.
+FOREACH (_component ${GLIB_FIND_COMPONENTS})
+ IF (${_component} STREQUAL "gio")
+ FIND_LIBRARY(GLIB_GIO_LIBRARIES NAMES gio-2.0 HINTS ${_GLIB_LIBRARY_DIR})
+ SET(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GIO_LIBRARIES)
+ ELSEIF (${_component} STREQUAL "gobject")
+ FIND_LIBRARY(GLIB_GOBJECT_LIBRARIES NAMES gobject-2.0 HINTS ${_GLIB_LIBRARY_DIR})
+ SET(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GOBJECT_LIBRARIES)
+ ELSEIF (${_component} STREQUAL "gmodule")
+ FIND_LIBRARY(GLIB_GMODULE_LIBRARIES NAMES gmodule-2.0 HINTS ${_GLIB_LIBRARY_DIR})
+ SET(ADDITIONAL_REQUIRED_VARS "${ADDITIONAL_REQUIRED_VARS} GLIB_GMODULE_LIBRARIES")
+ ELSEIF (${_component} STREQUAL "gthread")
+ FIND_LIBRARY(GLIB_GTHREAD_LIBRARIES NAMES gthread-2.0 HINTS ${_GLIB_LIBRARY_DIR})
+ SET(ADDITIONAL_REQUIRED_VARS ${ADDITIONAL_REQUIRED_VARS} GLIB_GTHREAD_LIBRARIES)
+ ENDIF ()
+ENDFOREACH ()
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLIB REQUIRED_VARS GLIB_INCLUDE_DIRS GLIB_LIBRARIES ${ADDITIONAL_REQUIRED_VARS}
+ VERSION_VAR GLIB_VERSION)
Deleted: trunk/Source/cmake/FindGlib.cmake (125442 => 125443)
--- trunk/Source/cmake/FindGlib.cmake 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/cmake/FindGlib.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,43 +0,0 @@
-# - Try to find Glib-2.0 (with gobject)
-# Once done, this will define
-#
-# Glib_FOUND - system has Glib
-# Glib_INCLUDE_DIRS - the Glib include directories
-# Glib_LIBRARIES - link these to use Glib
-
-include(LibFindMacros)
-
-# Use pkg-config to get hints about paths
-libfind_pkg_check_modules(Glib_PKGCONF glib-2.0)
-
-# Main include dir
-find_path(Glib_INCLUDE_DIR
- NAMES glib.h
- PATHS ${Glib_PKGCONF_INCLUDE_DIRS}
- PATH_SUFFIXES glib-2.0
-)
-
-# Glib-related libraries also use a separate config header, which is in lib dir
-find_path(GlibConfig_INCLUDE_DIR
- NAMES glibconfig.h
- PATHS ${Glib_PKGCONF_INCLUDE_DIRS} /usr
- PATH_SUFFIXES lib/glib-2.0/include
-)
-
-# Finally the library itself
-find_library(Glib_LIBRARY
- NAMES glib-2.0
- PATHS ${Glib_PKGCONF_LIBRARY_DIRS}
-)
-find_library(Gobject_LIBRARY
- NAMES gobject-2.0
- PATHS ${Glib_PKGCONF_LIBRARY_DIRS}
-)
-
-# Set the include dir variables and the libraries and let libfind_process do the rest.
-# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-set(Glib_PROCESS_INCLUDES Glib_INCLUDE_DIR GlibConfig_INCLUDE_DIR)
-set(Glib_PROCESS_LIBS Glib_LIBRARY Gobject_LIBRARY)
-libfind_process(Glib)
-
-
Deleted: trunk/Source/cmake/FindGthread.cmake (125442 => 125443)
--- trunk/Source/cmake/FindGthread.cmake 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/cmake/FindGthread.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,4 +0,0 @@
-# Find include and libraries for Gthread library
-
-INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES (Gthread REQUIRED gthread-2.0>=2.20.0)
Modified: trunk/Source/cmake/OptionsEfl.cmake (125442 => 125443)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -33,8 +33,7 @@
FIND_PACKAGE(PNG REQUIRED)
FIND_PACKAGE(ZLIB REQUIRED)
-FIND_PACKAGE(Glib 2.31.8 REQUIRED)
-FIND_PACKAGE(Gthread REQUIRED)
+FIND_PACKAGE(GLIB 2.31.8 REQUIRED COMPONENTS gio gthread)
FIND_PACKAGE(LibSoup2 2.39.4.1 REQUIRED)
SET(ENABLE_GLIB_SUPPORT ON)
Modified: trunk/Tools/ChangeLog (125442 => 125443)
--- trunk/Tools/ChangeLog 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Tools/ChangeLog 2012-08-13 20:38:06 UTC (rev 125443)
@@ -1,3 +1,15 @@
+2012-08-13 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Remove glib-related Find modules and write single new one instead.
+ https://bugs.webkit.org/show_bug.cgi?id=93786
+
+ Reviewed by Rob Buis.
+
+ * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*.
+ * EWebLauncher/CMakeLists.txt: Ditto.
+ * MiniBrowser/efl/CMakeLists.txt: Ditto.
+ * WebKitTestRunner/PlatformEfl.cmake: Ditto.
+
2012-08-13 Peter Beverloo <[email protected]>
[Chromium] Fix apk generation for the Android platform
Modified: trunk/Tools/DumpRenderTree/efl/CMakeLists.txt (125442 => 125443)
--- trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2012-08-13 20:38:06 UTC (rev 125443)
@@ -40,7 +40,7 @@
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
- ${Glib_LIBRARIES}
+ ${GLIB_LIBRARIES}
${LIBSOUP24_LIBRARIES}
)
@@ -100,7 +100,7 @@
${EFLDEPS_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${FONTCONFIG_INCLUDE_DIR}
- ${Glib_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
${LIBSOUP24_INCLUDE_DIRS}
)
Modified: trunk/Tools/EWebLauncher/CMakeLists.txt (125442 => 125443)
--- trunk/Tools/EWebLauncher/CMakeLists.txt 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Tools/EWebLauncher/CMakeLists.txt 2012-08-13 20:38:06 UTC (rev 125443)
@@ -14,7 +14,7 @@
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
- ${Glib_LIBRARIES}
+ ${GLIB_LIBRARIES}
${LIBSOUP24_LIBRARIES}
)
@@ -24,7 +24,7 @@
${EDJE_INCLUDE_DIRS}
${EFLDEPS_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
- ${Glib_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
${LIBSOUP24_INCLUDE_DIRS}
)
Modified: trunk/Tools/MiniBrowser/efl/CMakeLists.txt (125442 => 125443)
--- trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2012-08-13 20:38:06 UTC (rev 125443)
@@ -42,8 +42,8 @@
IF (ENABLE_GLIB_SUPPORT)
LIST(APPEND MiniBrowser_LIBRARIES
- ${Glib_LIBRARIES}
- ${Gthread_LIBRARIES}
+ ${GLIB_LIBRARIES}
+ ${GLIB_GTHREAD_LIBRARIES}
)
ENDIF ()
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (125442 => 125443)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2012-08-13 20:33:18 UTC (rev 125442)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2012-08-13 20:38:06 UTC (rev 125443)
@@ -34,7 +34,7 @@
${ECORE_X_INCLUDE_DIRS}
${EFLDEPS_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
- ${Glib_INCLUDE_DIRS}
+ ${GLIB_INCLUDE_DIRS}
)
LIST(APPEND WebKitTestRunner_LIBRARIES
@@ -42,7 +42,7 @@
${ECORE_X_LIBRARIES}
${EDJE_LIBRARIES}
${EFLDEPS_LIBRARIES}
- ${Glib_LIBRARIES}
+ ${GLIB_LIBRARIES}
${OPENGL_LIBRARIES}
${WTF_LIBRARY_NAME}
)
