Diff
Modified: trunk/ChangeLog (125466 => 125467)
--- trunk/ChangeLog 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/ChangeLog 2012-08-13 23:30:23 UTC (rev 125467)
@@ -1,3 +1,30 @@
+2012-08-11 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Rewrite FindLibSoup2.cmake.
+ https://bugs.webkit.org/show_bug.cgi?id=93191
+
+ Reviewed by Rob Buis.
+
+ The existing LibSoup2 was imported from somewhere else and not
+ only did it contain a lot of unnecessary cruft to look for libsoup
+ 2.2 (which we do not support anyway), but it also relied on the
+ paths returned by pkg-config for setting the library and include
+ paths.
+
+ For one, this meant "-lsoup-2.4" was passed to the linked instead
+ of "-L/path/to/libsoup-2.4.so", which would sometimes make a
+ system version of libsoup to be picked up instead of the one
+ installed by, say, jhbuild.
+
+ The new FindLibSoup.cmake now only looks for libsoup 2.4 and
+ relies on pkg-config solely for retrieving the current LibSoup
+ version.
+
+ * Source/cmake/FindLibSoup.cmake: Added.
+ * Source/cmake/FindLibSoup2.cmake: Removed.
+ * Source/cmake/OptionsEfl.cmake: Look for LibSoup instead of
+ LibSoup2, look for the GObject component of Glib.
+
2012-08-13 Raphael Kubo da Costa <[email protected]>
[CMake] Remove glib-related Find modules and write single new one instead.
Modified: trunk/Source/WebCore/ChangeLog (125466 => 125467)
--- trunk/Source/WebCore/ChangeLog 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Source/WebCore/ChangeLog 2012-08-13 23:30:23 UTC (rev 125467)
@@ -1,3 +1,13 @@
+2012-08-11 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Rewrite FindLibSoup2.cmake.
+ https://bugs.webkit.org/show_bug.cgi?id=93191
+
+ Reviewed by Rob Buis.
+
+ * PlatformEfl.cmake: Use LIBSOUP_FOO instead of LIBSOUP24_FOO,
+ also link against GObject, which is needed by libsoup.
+
2012-08-10 James Robinson <[email protected]>
[chromium] Clean up dependencies for Canvas2DLayerBridgeTest and GraphicsLayerChromiumTest unit tests
Modified: trunk/Source/WebCore/PlatformEfl.cmake (125466 => 125467)
--- trunk/Source/WebCore/PlatformEfl.cmake 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2012-08-13 23:30:23 UTC (rev 125467)
@@ -224,7 +224,8 @@
${SQLITE_LIBRARIES}
${GLIB_LIBRARIES}
${GLIB_GIO_LIBRARIES}
- ${LIBSOUP24_LIBRARIES}
+ ${GLIB_GOBJECT_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
${ZLIB_LIBRARIES}
)
@@ -239,7 +240,7 @@
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
${GLIB_INCLUDE_DIRS}
- ${LIBSOUP24_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
Modified: trunk/Source/WebKit/ChangeLog (125466 => 125467)
--- trunk/Source/WebKit/ChangeLog 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Source/WebKit/ChangeLog 2012-08-13 23:30:23 UTC (rev 125467)
@@ -1,3 +1,12 @@
+2012-08-11 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Rewrite FindLibSoup2.cmake.
+ https://bugs.webkit.org/show_bug.cgi?id=93191
+
+ Reviewed by Rob Buis.
+
+ * PlatformEfl.cmake: Use LIBSOUP_FOO instead of LIBSOUP24_FOO.
+
2012-08-13 Raphael Kubo da Costa <[email protected]>
[CMake] Remove glib-related Find modules and write single new one instead.
Modified: trunk/Source/WebKit/PlatformEfl.cmake (125466 => 125467)
--- trunk/Source/WebKit/PlatformEfl.cmake 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2012-08-13 23:30:23 UTC (rev 125467)
@@ -27,7 +27,7 @@
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
${GLIB_INCLUDE_DIRS}
- ${LIBSOUP24_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
)
IF (ENABLE_SVG)
@@ -160,7 +160,7 @@
${JPEG_LIBRARY}
${CMAKE_DL_LIBS}
${GLIB_LIBRARIES}
- ${LIBSOUP24_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
)
SET(WebKit_THEME_DEFINITION "")
Modified: trunk/Source/WebKit2/ChangeLog (125466 => 125467)
--- trunk/Source/WebKit2/ChangeLog 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-13 23:30:23 UTC (rev 125467)
@@ -1,3 +1,13 @@
+2012-08-11 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Rewrite FindLibSoup2.cmake.
+ https://bugs.webkit.org/show_bug.cgi?id=93191
+
+ Reviewed by Rob Buis.
+
+ * PlatformEfl.cmake: Use LIBSOUP_FOO instead of LIBSOUP24_FOO, and
+ do not use LIBSOUP24_LDFLAGS, as it is not needed anymore.
+
2012-08-13 Alexey Proskuryakov <[email protected]>
[WK2] Move a remaining per-process message from WebContext to WebProcessProxy
Modified: trunk/Source/WebKit2/PlatformEfl.cmake (125466 => 125467)
--- trunk/Source/WebKit2/PlatformEfl.cmake 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2012-08-13 23:30:23 UTC (rev 125467)
@@ -5,7 +5,6 @@
${EFLDEPS_LDFLAGS}
${EFREET_LDFLAGS}
${EVAS_LDFLAGS}
- ${LIBSOUP24_LDFLAGS}
)
LIST(APPEND WebKit2_SOURCES
@@ -143,7 +142,7 @@
${LIBXSLT_INCLUDE_DIRS}
${SQLITE_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
- ${LIBSOUP24_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
${WTF_DIR}
)
@@ -161,7 +160,7 @@
${JPEG_LIBRARY}
${CMAKE_DL_LIBS}
${GLIB_LIBRARIES}
- ${LIBSOUP24_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
)
LIST (APPEND WebProcess_SOURCES
@@ -227,7 +226,7 @@
${ECORE_LIBRARIES}
${ECORE_EVAS_LIBRARIES}
${EVAS_LIBRARIES}
- ${LIBSOUP24_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
gtest
)
Added: trunk/Source/cmake/FindLibSoup.cmake (0 => 125467)
--- trunk/Source/cmake/FindLibSoup.cmake (rev 0)
+++ trunk/Source/cmake/FindLibSoup.cmake 2012-08-13 23:30:23 UTC (rev 125467)
@@ -0,0 +1,52 @@
+# - Try to find LibSoup 2.4
+# This module defines the following variables:
+#
+# LIBSOUP_FOUND - LibSoup 2.4 was found
+# LIBSOUP_INCLUDE_DIRS - the LibSoup 2.4 include directories
+# LIBSOUP_LIBRARIES - link these to use LibSoup 2.4
+#
+# 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.
+
+# LibSoup does not provide an easy way to retrieve its version other than its
+# .pc file, so we need to rely on PC_LIBSOUP_VERSION and REQUIRE the .pc file
+# to be found.
+FIND_PACKAGE(PkgConfig)
+PKG_CHECK_MODULES(PC_LIBSOUP REQUIRED QUIET libsoup-2.4)
+
+FIND_PATH(LIBSOUP_INCLUDE_DIRS
+ NAMES libsoup/soup.h
+ HINTS ${PC_LIBSOUP_INCLUDEDIR}
+ ${PC_LIBSOUP_INCLUDE_DIRS}
+ PATH_SUFFIXES libsoup-2.4
+)
+
+FIND_LIBRARY(LIBSOUP_LIBRARIES
+ NAMES soup-2.4
+ HINTS ${PC_LIBSOUP_LIBDIR}
+ ${PC_LIBSOUP_LIBRARY_DIRS}
+)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibSoup REQUIRED_VARS LIBSOUP_INCLUDE_DIRS LIBSOUP_LIBRARIES
+ VERSION_VAR PC_LIBSOUP_VERSION)
Deleted: trunk/Source/cmake/FindLibSoup2.cmake (125466 => 125467)
--- trunk/Source/cmake/FindLibSoup2.cmake 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Source/cmake/FindLibSoup2.cmake 2012-08-13 23:30:23 UTC (rev 125467)
@@ -1,191 +0,0 @@
-# - Try to find libsoup
-# Find libsoup headers, libraries and the answer to all questions.
-#
-# LIBSOUP2_FOUND True if libsoup2 got found
-# LIBSOUP2_INCLUDE_DIRS Location of libsoup2 headers
-# LIBSOUP2_LIBRARIES List of libaries to use libsoup2
-# LIBSOUP2_LIBRARY_DIRS Location of libsoup2 library
-#
-# LIBSOUP22_FOUND True if libsoup2.2 got found
-# LIBSOUP22_INCLUDE_DIRS Location of libsoup2.2 headers
-# LIBSOUP22_LIBRARIES List of libaries to use libsoup2.2
-# LIBSOUP22_LIBRARY_DIRS Location of libsoup2.2 library
-#
-# LIBSOUP24_FOUND True if libsoup2.4 got found
-# LIBSOUP24_INCLUDE_DIRS Location of libsoup2.4 headers
-# LIBSOUP24_LIBRARIES List of libaries to use libsoup2.4
-# LIBSOUP24_LIBRARY_DIRS Location of libsoup2.4 library
-#
-# Set LIBSOUP2_MIN_VERSION to find libsoup2.2 or libsoup2.4 if only
-# one of both libraries is supported
-#
-# Don't use LIBSOUP2_MIN_VERSION if you want to support
-# libsoup2.2 and libsoup2.4.
-# Instead use LIBSPOUP22_MIN_VERSION and LIBSPOUP24_MIN_VERSION.
-#
-# Set LIBSPOUP22_MIN_VERSION to find libsoup2.2 which version is
-# greater than LIBSPOUP22_MIN_VERSION
-#
-# Set LIBSPOUP24_MIN_VERSION to find libsoup2.4 which version is
-# greater than LIBSPOUP24_MIN_VERSION
-#
-# WARNING: It is not possible to set LIBSPOUP22_MIN_VERSION
-# and support any version of libsoup2.4 at the same time.
-# In this situation you have to set LIBSPOUP24_MIN_VERSION also.
-# The same applies to LIBSPOUP24_MIN_VERSION and libsoup2.2.
-#
-# Copyright (c) 2007 Daniel Gollub <[email protected]>
-# Copyright (c) 2008 Bjoern Ricks <[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 copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-# derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-#
-
-INCLUDE( FindPkgConfig )
-
-IF ( LibSoup2_FIND_VERSION AND NOT LIBSOUP2_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
- SET( LIBSOUP2_MIN_VERSION "${LibSoup2_FIND_VERSION}" )
- SET( LIBSOUP24_MIN_VERSION "${LibSoup2_FIND_VERSION}" )
-ENDIF ( LibSoup2_FIND_VERSION AND NOT LIBSOUP2_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
-
-IF ( LibSoup2_FIND_REQUIRED )
- SET( _pkgconfig_REQUIRED "REQUIRED" )
-ELSE( LibSoup2_FIND_REQUIRED )
- SET( _pkgconfig_REQUIRED "" )
-ENDIF ( LibSoup2_FIND_REQUIRED )
-
-IF ( LIBSOUP2_MIN_VERSION )
- STRING(REGEX REPLACE "^(2)(\\.)([0-9]*)(\\.?)(.*)" "\\3" LIBSOUP2_VERSION_MINOR "${LIBSOUP2_MIN_VERSION}")
- IF ( LIBSOUP2_VERSION_MINOR EQUAL "2" )
- SET( LIBSOUP22_MIN_VERSION "${LIBSOUP2_MIN_VERSION}" )
- ELSE ( LIBSOUP2_VERSION_MINOR EQUAL "2" )
- SET( LIBSOUP24_MIN_VERSION "${LIBSOUP2_MIN_VERSION}" )
- ENDIF ( LIBSOUP2_VERSION_MINOR EQUAL "2" )
-ENDIF ( LIBSOUP2_MIN_VERSION )
-
-# try to find libsoup2.2>=LIBSOUP22_MIN_VERSION
-IF ( LIBSOUP22_MIN_VERSION )
- PKG_SEARCH_MODULE( LIBSOUP22 libsoup-2.2>=${LIBSOUP22_MIN_VERSION} libsoup2>=${LIBSOUP22_MIN_VERSION} )
-ENDIF ( LIBSOUP22_MIN_VERSION )
-
-# try to find libsoup2.4>=LIBSOUP24_MIN_VERSION
-IF ( LIBSOUP24_MIN_VERSION )
- PKG_SEARCH_MODULE( LIBSOUP24 libsoup-2.4>=${LIBSOUP24_MIN_VERSION} libsoup2>=${LIBSOUP24_MIN_VERSION} )
-ENDIF ( LIBSOUP24_MIN_VERSION )
-
-# try to find any version of libsoup2.4 if LIBSOUP22_MIN_VERSION is not set
-IF ( NOT LIBSOUP24_FOUND AND NOT LIBSOUP22_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
- PKG_SEARCH_MODULE( LIBSOUP24 libsoup-2.4 libsoup2 )
-ENDIF ( NOT LIBSOUP24_FOUND AND NOT LIBSOUP22_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
-
-# try to find any version of libsoup2.2 if LIBSOUP24_MIN_VERSION is not set
-IF ( NOT LIBSOUP22_FOUND AND NOT LIBSOUP24_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
- PKG_SEARCH_MODULE( LIBSOUP22 libsoup-2.2 libsoup2 )
-ENDIF ( NOT LIBSOUP22_FOUND AND NOT LIBSOUP24_MIN_VERSION AND NOT LIBSOUP24_MIN_VERSION )
-
-# set LIBSOUP2_ variables
-IF ( LIBSOUP24_FOUND )
- # prefer libsoup2.4 to libsoup2.2 if both are found
- SET( LIBSOUP2_FOUND ${LIBSOUP24_FOUND} CACHE INTERNAL "" )
- SET( LIBSOUP2_INCLUDE_DIRS ${LIBSOUP24_INCLUDE_DIRS} CACHE INTERNAL "" )
- SET( LIBSOUP2_LIBRARIES ${LIBSOUP24_LIBRARIES} CACHE INTERNAL "" )
- SET( LIBSOUP2_LIBRARY_DIRS ${LIBSOUP24_LIBRARY_DIRS} CACHE INTERNAL "" )
- SET( LIBSOUP2_VERSION ${LIBSOUP24_VERSION} CACHE INTERNAL "" )
-ELSEIF ( LIBSOUP22_FOUND )
- SET( LIBSOUP2_FOUND ${LIBSOUP22_FOUND} CACHE INTERNAL "" )
- SET( LIBSOUP2_INCLUDE_DIRS ${LIBSOUP22_INCLUDE_DIRS} CACHE INTERNAL "" )
- SET( LIBSOUP2_LIBRARIES ${LIBSOUP22_LIBRARIES} CACHE INTERNAL "" )
- SET( LIBSOUP2_LIBRARY_DIRS ${LIBSOUP22_LIBRARY_DIRS} CACHE INTERNAL "" )
- SET( LIBSOUP2_VERSION ${LIBSOUP22_VERSION} CACHE INTERNAL "" )
-ELSEIF( PKG_CONFIG_FOUND AND LibSoup2_FIND_REQUIRED )
- # raise an error if both libs are not found
- # and FIND_PACKAGE( LibSoup2 REQUIRED ) was called
- MESSAGE( FATAL_ERROR "package libsoup2 not found" )
-ENDIF ( LIBSOUP24_FOUND )
-
-IF( NOT LIBSOUP2_FOUND AND NOT PKG_CONFIG_FOUND )
- # WARNING:
- # This case is executed if pkg-config isn't installed.
- # Currently in this case it is only checked if libsoup2.2 is available.
- # Therefore please don't use this cmake module without pkg-config!
- FIND_PATH( _libsoup2_include_DIR libsoup/soup.h PATH_SUFFIXES libsoup libsoup-2.2 )
- FIND_LIBRARY( _libsoup2_LIBRARY soup-2.2)
-
- IF ( _libsoup2_include_DIR AND _libsoup2_LIBRARY )
- SET ( _libsoup2_FOUND TRUE )
- ENDIF ( _libsoup2_include_DIR AND _libsoup2_LIBRARY )
-
- IF ( _libsoup2_FOUND )
- SET ( LIBSOUP2_INCLUDE_DIRS ${_libsoup2_include_DIR} )
- SET ( LIBSOUP2_LIBRARIES ${_libsoup2_LIBRARY} )
-
- # find requited glib2
- IF( NOT GLIB2_FOUND )
- FIND_PACKAGE( GLIB2 REQUIRED )
- IF ( GLIB2_FOUND )
- SET ( LIBSOUP2_INCLUDE_DIRS ${LIBSOUP2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS} )
- SET ( LIBSOUP2_LIBRARIES ${LIBSOUP2_LIBRARIES} ${GLIB2_LIBRARIES} )
- ENDIF ( GLIB2_FOUND )
- ENDIF( NOT GLIB2_FOUND )
-
- # find required libxml2
- IF( NOT LIBXML2_FOUND )
- FIND_PACKAGE( LibXml2 REQUIRED )
- IF ( LIBXML2_FOUND )
- SET ( LIBSOUP2_INCLUDE_DIRS ${LIBSOUP2_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} )
- SET ( LIBSOUP2_LIBRARIES ${LIBSOUP2_LIBRARIES} ${LIBXML2_LIBRARIES} )
- ENDIF( LIBXML2_FOUND )
- ENDIF( NOT LIBXML2_FOUND )
-
- # find required gnutls
- IF( NOT GNUTLS_FOUND )
- FIND_PACKAGE( GNUTLS REQUIRED )
- IF ( GNUTLS_FOUND )
- SET ( LIBSOUP2_INCLUDE_DIRS ${LIBSOUP2_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIRS} )
- SET ( LIBSOUP2_LIBRARIES ${LIBSOUP2_LIBRARIES} ${GNUTLS_LIBRARIES} )
- ENDIF( GNUTLS_FOUND )
- ENDIF( NOT GNUTLS_FOUND )
- ENDIF ( _libsoup2_FOUND )
-
- MARK_AS_ADVANCED( _libsoup2_include_DIR _libsoup2_LIBRARY )
-
- # Report results
- IF ( LIBSOUP2_LIBRARIES AND LIBSOUP2_INCLUDE_DIRS AND _libsoup2_FOUND )
- SET( LIBSOUP2_FOUND 1 )
- IF ( NOT LibSoup2_FIND_QUIETLY )
- MESSAGE( STATUS "Found libsoup2: ${_libsoup2_LIBRARY}" )
- ENDIF ( NOT LibSoup2_FIND_QUIETLY )
- ELSE ( LIBSOUP2_LIBRARIES AND LIBSOUP_INCLUDE_DIRS AND _libsoup2_FOUND )
- IF ( LibSoup2_FIND_REQUIRED )
- MESSAGE( SEND_ERROR "Could NOT find libsoup2" )
- ELSE ( LibSoup2_FIND_REQUIRED )
- IF ( NOT LibSoup2_FIND_QUIETLY )
- MESSAGE( STATUS "Could NOT find libsoup2" )
- ENDIF ( NOT LibSoup2_FIND_QUIETLY )
- ENDIF ( LibSoup2_FIND_REQUIRED )
- ENDIF ( LIBSOUP2_LIBRARIES AND LIBSOUP2_INCLUDE_DIRS AND _libsoup2_FOUND )
-ENDIF( NOT LIBSOUP2_FOUND AND NOT PKG_CONFIG_FOUND )
-
-# Hide advanced variables from CMake GUIs
-MARK_AS_ADVANCED( LIBSOUP2_LIBRARIES LIBSOUP2_INCLUDE_DIRS )
-
Modified: trunk/Source/cmake/OptionsEfl.cmake (125466 => 125467)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-08-13 23:30:23 UTC (rev 125467)
@@ -33,8 +33,8 @@
FIND_PACKAGE(PNG REQUIRED)
FIND_PACKAGE(ZLIB REQUIRED)
-FIND_PACKAGE(GLIB 2.31.8 REQUIRED COMPONENTS gio gthread)
-FIND_PACKAGE(LibSoup2 2.39.4.1 REQUIRED)
+FIND_PACKAGE(GLIB 2.31.8 REQUIRED COMPONENTS gio gobject gthread)
+FIND_PACKAGE(LibSoup 2.39.4.1 REQUIRED)
SET(ENABLE_GLIB_SUPPORT ON)
SET(WTF_USE_SOUP 1)
Modified: trunk/Tools/ChangeLog (125466 => 125467)
--- trunk/Tools/ChangeLog 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Tools/ChangeLog 2012-08-13 23:30:23 UTC (rev 125467)
@@ -1,3 +1,19 @@
+2012-08-11 Raphael Kubo da Costa <[email protected]>
+
+ [CMake] Rewrite FindLibSoup2.cmake.
+ https://bugs.webkit.org/show_bug.cgi?id=93191
+
+ Reviewed by Rob Buis.
+
+ * DumpRenderTree/efl/CMakeLists.txt: Use LIBSOUP_FOO instead of
+ LIBSOUP24_FOO, and do not use LIBSOUP24_LDFLAGS, as it is not
+ needed anymore.
+ * EWebLauncher/CMakeLists.txt: Ditto.
+ * MiniBrowser/efl/CMakeLists.txt: Ditto.
+ * TestWebKitAPI/PlatformEfl.cmake: Ditto.
+ * WebKitTestRunner/CMakeLists.txt: Ditto.
+ * WebKitTestRunner/PlatformEfl.cmake: Ditto.
+
2012-08-13 Brady Eidson <[email protected]>
With asynchronous plug-in initialization, WebProcess and PluginProcess can deadlock
Modified: trunk/Tools/DumpRenderTree/efl/CMakeLists.txt (125466 => 125467)
--- trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2012-08-13 23:30:23 UTC (rev 125467)
@@ -41,7 +41,7 @@
${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
${GLIB_LIBRARIES}
- ${LIBSOUP24_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
)
SET(DumpRenderTree_INCLUDE_DIRECTORIES
@@ -101,7 +101,7 @@
${EVAS_INCLUDE_DIRS}
${FONTCONFIG_INCLUDE_DIR}
${GLIB_INCLUDE_DIRS}
- ${LIBSOUP24_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
)
SET(DumpRenderTree_LINK_FLAGS
@@ -109,7 +109,6 @@
${EDJE_LDFLAGS}
${EFLDEPS_LDFLAGS}
${EVAS_LDFLAGS}
- ${LIBSOUP24_LDFLAGS}
)
# FIXME: DOWNLOADED_FONTS_DIR should not hardcode the directory
Modified: trunk/Tools/EWebLauncher/CMakeLists.txt (125466 => 125467)
--- trunk/Tools/EWebLauncher/CMakeLists.txt 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Tools/EWebLauncher/CMakeLists.txt 2012-08-13 23:30:23 UTC (rev 125467)
@@ -15,7 +15,7 @@
${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
${GLIB_LIBRARIES}
- ${LIBSOUP24_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
)
SET(EWebLauncher_INCLUDE_DIRECTORIES
@@ -25,7 +25,7 @@
${EFLDEPS_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
- ${LIBSOUP24_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
)
SET(EWebLauncher_LINK_FLAGS
@@ -33,7 +33,6 @@
${EDJE_LDFLAGS}
${EFLDEPS_LDFLAGS}
${EVAS_LDFLAGS}
- ${LIBSOUP24_LDFLAGS}
)
ADD_DEFINITIONS(-DDATA_DIR=\"${THEME_BINARY_DIR}\")
Modified: trunk/Tools/MiniBrowser/efl/CMakeLists.txt (125466 => 125467)
--- trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2012-08-13 23:30:23 UTC (rev 125467)
@@ -25,7 +25,7 @@
${EFLDEPS_LIBRARIES}
${EVAS_LIBRARIES}
${FONTCONFIG_LIBRARIES}
- ${LIBSOUP24_LIBRARIES}
+ ${LIBSOUP_LIBRARIES}
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${OPENGL_LIBRARIES}
@@ -37,7 +37,6 @@
${EDJE_LDFLAGS}
${EFLDEPS_LDFLAGS}
${EVAS_LDFLAGS}
- ${LIBSOUP24_LDFLAGS}
)
IF (ENABLE_GLIB_SUPPORT)
Modified: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (125466 => 125467)
--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2012-08-13 23:30:23 UTC (rev 125467)
@@ -8,7 +8,7 @@
)
SET(ForwardingNetworkHeadersForTestWebKitAPI_NAME forwarding-headersSoupForTestWebKitAPI)
-INCLUDE_DIRECTORIES(${LIBSOUP24_INCLUDE_DIRS}
+INCLUDE_DIRECTORIES(${LIBSOUP_INCLUDE_DIRS}
${WEBKIT2_DIR}/UIProcess/API/C/soup
${WEBKIT2_DIR}/UIProcess/API/C/efl
${ECORE_INCLUDE_DIRS}
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (125466 => 125467)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2012-08-13 23:30:23 UTC (rev 125467)
@@ -42,7 +42,7 @@
${DERIVED_SOURCES_DIR}/InjectedBundle
${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR}/Source
- ${LIBSOUP24_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
)
SET(WebKitTestRunnerInjectedBundle_SOURCES
Modified: trunk/Tools/WebKitTestRunner/PlatformEfl.cmake (125466 => 125467)
--- trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2012-08-13 22:46:49 UTC (rev 125466)
+++ trunk/Tools/WebKitTestRunner/PlatformEfl.cmake 2012-08-13 23:30:23 UTC (rev 125467)
@@ -3,7 +3,6 @@
${EDJE_LDFLAGS}
${EFLDEPS_LDFLAGS}
${EVAS_LDFLAGS}
- ${LIBSOUP24_LDFLAGS}
)
ADD_CUSTOM_TARGET(forwarding-headersEflForWebKitTestRunner
