haikuwebkit/Source/cmake/FindGLIB.cmake

123 lines
5.4 KiB
CMake
Raw Permalink Normal View History

[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. Source/JavaScriptCore: * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebCore: 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. Source/WebKit: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebKit2: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WTF: * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it. Tools: * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*. * EWebLauncher/CMakeLists.txt: Ditto. * MiniBrowser/efl/CMakeLists.txt: Ditto. * WebKitTestRunner/PlatformEfl.cmake: Ditto. Canonical link: https://commits.webkit.org/111718@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-08-13 20:38:06 +00:00
# - 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
#
[CMake] Unify coding style for CMake files https://bugs.webkit.org/show_bug.cgi?id=103605 Patch by Halton Huo <halton.huo@intel.com> on 2012-12-05 Reviewed by Laszlo Gombos. Update cmake files(.cmake, CMakeLists.txt) with following style rules: 1. Indentation 1.1 Use spaces, not tabs. 1.2 Four spaces as indent. 2. Spacing 2.1 Place one space between control statements and their parentheses. For eg, if (), else (), elseif (), endif (), foreach (), endforeach (), while (), endwhile (), break (). 2.2 Do not place spaces between function and macro statements and their parentheses. For eg, macro(), endmacro(), function(), endfunction(). 2.3 Do not place spaces between a command or function or macro and its parentheses, or between a parenthesis and its content. For eg, message("testing") not message( "testing") or message ("testing" ) 2.4 No space at line ending. 3. Lowercase when call commands macros and functions. For eg, add_executable() not ADD_EXECUTABLE(), set() not SET(). .: * CMakeLists.txt: * Source/CMakeLists.txt: * Source/PlatformEfl.cmake: * Source/cmake/EFLHelpers.cmake: * Source/cmake/FindATK.cmake: * Source/cmake/FindCFLite.cmake: * Source/cmake/FindCairo.cmake: * Source/cmake/FindDBus.cmake: * Source/cmake/FindDirectX.cmake: * Source/cmake/FindE_DBus.cmake: * Source/cmake/FindEcore.cmake: * Source/cmake/FindEdje.cmake: * Source/cmake/FindEet.cmake: * Source/cmake/FindEeze.cmake: * Source/cmake/FindEfreet.cmake: * Source/cmake/FindEina.cmake: * Source/cmake/FindElementary.cmake: * Source/cmake/FindEnchant.cmake: * Source/cmake/FindEvas.cmake: * Source/cmake/FindFontconfig.cmake: * Source/cmake/FindGLIB.cmake: * Source/cmake/FindGStreamer.cmake: * Source/cmake/FindGperf.cmake: * Source/cmake/FindHarfBuzz.cmake: * Source/cmake/FindICU.cmake: * Source/cmake/FindLibSoup.cmake: * Source/cmake/FindQuickTimeSDK.cmake: * Source/cmake/FindSqlite.cmake: * Source/cmake/OptionsBlackBerry.cmake: * Source/cmake/OptionsCommon.cmake: * Source/cmake/OptionsEfl.cmake: * Source/cmake/OptionsWinCE.cmake: * Source/cmake/OptionsWindows.cmake: * Source/cmake/WebKitFS.cmake: * Source/cmake/WebKitFeatures.cmake: * Source/cmake/WebKitHelpers.cmake: * Source/cmake/WebKitMacros.cmake: * Source/cmake/WebKitPackaging.cmake: * Source/cmake/gtest/CMakeLists.txt: Source/JavaScriptCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * shell/CMakeLists.txt: * shell/PlatformBlackBerry.cmake: * shell/PlatformEfl.cmake: * shell/PlatformWinCE.cmake: Source/WebCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * UseJSC.cmake: * UseV8.cmake: Source/WebKit: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: Source/WebKit/efl: * DefaultTheme/CMakeLists.txt: Source/WebKit2: * CMakeLists.txt: * PlatformEfl.cmake: * win/WebKit2ExportGenerator.vcproj: * win/WebKit2ExportGeneratorCommon.vsprops: Source/WTF: * CMakeLists.txt: * wtf/CMakeLists.txt: * wtf/PlatformBlackBerry.cmake: * wtf/PlatformEfl.cmake: * wtf/PlatformWinCE.cmake: Tools: * CMakeLists.txt: * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: * DumpRenderTree/efl/CMakeLists.txt: * EWebLauncher/CMakeLists.txt: * EWebLauncher/ControlTheme/CMakeLists.txt: * MiniBrowser/efl/CMakeLists.txt: * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/PlatformEfl.cmake: * WebKitTestRunner/CMakeLists.txt: * WebKitTestRunner/PlatformEfl.cmake: * WinCELauncher/CMakeLists.txt: * clang/ReportMemoryUsagePlugin/CMakeLists.txt: Canonical link: https://commits.webkit.org/122367@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@136790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-12-06 03:10:13 +00:00
# Optionally, the COMPONENTS keyword can be passed to find_package()
[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. Source/JavaScriptCore: * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebCore: 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. Source/WebKit: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebKit2: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WTF: * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it. Tools: * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*. * EWebLauncher/CMakeLists.txt: Ditto. * MiniBrowser/efl/CMakeLists.txt: Ditto. * WebKitTestRunner/PlatformEfl.cmake: Ditto. Canonical link: https://commits.webkit.org/111718@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-08-13 20:38:06 +00:00
# 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 <rakuco@webkit.org>
#
# 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.
[CMake] Find modules should find pkg-config with find_package(PkgConfig QUIET) https://bugs.webkit.org/show_bug.cgi?id=208948 Reviewed by Michael Catanzaro. * Source/cmake/FindATK.cmake: * Source/cmake/FindATKBridge.cmake: * Source/cmake/FindATSPI.cmake: * Source/cmake/FindCairo.cmake: * Source/cmake/FindCairoGL.cmake: * Source/cmake/FindEGL.cmake: * Source/cmake/FindEnchant.cmake: * Source/cmake/FindFontconfig.cmake: * Source/cmake/FindGDK3.cmake: * Source/cmake/FindGLIB.cmake: * Source/cmake/FindGObjectIntrospection.cmake: * Source/cmake/FindGStreamer.cmake: * Source/cmake/FindGTK3.cmake: * Source/cmake/FindGTKUnixPrint.cmake: * Source/cmake/FindHarfBuzz.cmake: * Source/cmake/FindLibEpoxy.cmake: * Source/cmake/FindLibNotify.cmake: * Source/cmake/FindLibPSL.cmake: * Source/cmake/FindLibSoup.cmake: * Source/cmake/FindLibseccomp.cmake: * Source/cmake/FindLibsecret.cmake: * Source/cmake/FindLibtasn1.cmake: * Source/cmake/FindLibxkbcommon.cmake: * Source/cmake/FindNghttp2.cmake: * Source/cmake/FindOpenGL.cmake: * Source/cmake/FindOpenGLES2.cmake: * Source/cmake/FindOpenJPEG.cmake: * Source/cmake/FindSQLite3.cmake: * Source/cmake/FindWOFF2Dec.cmake: * Source/cmake/FindWPE.cmake: * Source/cmake/FindWPEBackend-fdo.cmake: * Source/cmake/FindWayland.cmake: * Source/cmake/FindWaylandProtocols.cmake: * Source/cmake/FindWebP.cmake: Canonical link: https://commits.webkit.org/221925@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258361 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2020-03-12 21:42:19 +00:00
find_package(PkgConfig QUIET)
[CMake] Unify coding style for CMake files https://bugs.webkit.org/show_bug.cgi?id=103605 Patch by Halton Huo <halton.huo@intel.com> on 2012-12-05 Reviewed by Laszlo Gombos. Update cmake files(.cmake, CMakeLists.txt) with following style rules: 1. Indentation 1.1 Use spaces, not tabs. 1.2 Four spaces as indent. 2. Spacing 2.1 Place one space between control statements and their parentheses. For eg, if (), else (), elseif (), endif (), foreach (), endforeach (), while (), endwhile (), break (). 2.2 Do not place spaces between function and macro statements and their parentheses. For eg, macro(), endmacro(), function(), endfunction(). 2.3 Do not place spaces between a command or function or macro and its parentheses, or between a parenthesis and its content. For eg, message("testing") not message( "testing") or message ("testing" ) 2.4 No space at line ending. 3. Lowercase when call commands macros and functions. For eg, add_executable() not ADD_EXECUTABLE(), set() not SET(). .: * CMakeLists.txt: * Source/CMakeLists.txt: * Source/PlatformEfl.cmake: * Source/cmake/EFLHelpers.cmake: * Source/cmake/FindATK.cmake: * Source/cmake/FindCFLite.cmake: * Source/cmake/FindCairo.cmake: * Source/cmake/FindDBus.cmake: * Source/cmake/FindDirectX.cmake: * Source/cmake/FindE_DBus.cmake: * Source/cmake/FindEcore.cmake: * Source/cmake/FindEdje.cmake: * Source/cmake/FindEet.cmake: * Source/cmake/FindEeze.cmake: * Source/cmake/FindEfreet.cmake: * Source/cmake/FindEina.cmake: * Source/cmake/FindElementary.cmake: * Source/cmake/FindEnchant.cmake: * Source/cmake/FindEvas.cmake: * Source/cmake/FindFontconfig.cmake: * Source/cmake/FindGLIB.cmake: * Source/cmake/FindGStreamer.cmake: * Source/cmake/FindGperf.cmake: * Source/cmake/FindHarfBuzz.cmake: * Source/cmake/FindICU.cmake: * Source/cmake/FindLibSoup.cmake: * Source/cmake/FindQuickTimeSDK.cmake: * Source/cmake/FindSqlite.cmake: * Source/cmake/OptionsBlackBerry.cmake: * Source/cmake/OptionsCommon.cmake: * Source/cmake/OptionsEfl.cmake: * Source/cmake/OptionsWinCE.cmake: * Source/cmake/OptionsWindows.cmake: * Source/cmake/WebKitFS.cmake: * Source/cmake/WebKitFeatures.cmake: * Source/cmake/WebKitHelpers.cmake: * Source/cmake/WebKitMacros.cmake: * Source/cmake/WebKitPackaging.cmake: * Source/cmake/gtest/CMakeLists.txt: Source/JavaScriptCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * shell/CMakeLists.txt: * shell/PlatformBlackBerry.cmake: * shell/PlatformEfl.cmake: * shell/PlatformWinCE.cmake: Source/WebCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * UseJSC.cmake: * UseV8.cmake: Source/WebKit: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: Source/WebKit/efl: * DefaultTheme/CMakeLists.txt: Source/WebKit2: * CMakeLists.txt: * PlatformEfl.cmake: * win/WebKit2ExportGenerator.vcproj: * win/WebKit2ExportGeneratorCommon.vsprops: Source/WTF: * CMakeLists.txt: * wtf/CMakeLists.txt: * wtf/PlatformBlackBerry.cmake: * wtf/PlatformEfl.cmake: * wtf/PlatformWinCE.cmake: Tools: * CMakeLists.txt: * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: * DumpRenderTree/efl/CMakeLists.txt: * EWebLauncher/CMakeLists.txt: * EWebLauncher/ControlTheme/CMakeLists.txt: * MiniBrowser/efl/CMakeLists.txt: * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/PlatformEfl.cmake: * WebKitTestRunner/CMakeLists.txt: * WebKitTestRunner/PlatformEfl.cmake: * WinCELauncher/CMakeLists.txt: * clang/ReportMemoryUsagePlugin/CMakeLists.txt: Canonical link: https://commits.webkit.org/122367@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@136790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-12-06 03:10:13 +00:00
pkg_check_modules(PC_GLIB QUIET glib-2.0)
[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. Source/JavaScriptCore: * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebCore: 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. Source/WebKit: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebKit2: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WTF: * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it. Tools: * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*. * EWebLauncher/CMakeLists.txt: Ditto. * MiniBrowser/efl/CMakeLists.txt: Ditto. * WebKitTestRunner/PlatformEfl.cmake: Ditto. Canonical link: https://commits.webkit.org/111718@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-08-13 20:38:06 +00:00
[CMake] Unify coding style for CMake files https://bugs.webkit.org/show_bug.cgi?id=103605 Patch by Halton Huo <halton.huo@intel.com> on 2012-12-05 Reviewed by Laszlo Gombos. Update cmake files(.cmake, CMakeLists.txt) with following style rules: 1. Indentation 1.1 Use spaces, not tabs. 1.2 Four spaces as indent. 2. Spacing 2.1 Place one space between control statements and their parentheses. For eg, if (), else (), elseif (), endif (), foreach (), endforeach (), while (), endwhile (), break (). 2.2 Do not place spaces between function and macro statements and their parentheses. For eg, macro(), endmacro(), function(), endfunction(). 2.3 Do not place spaces between a command or function or macro and its parentheses, or between a parenthesis and its content. For eg, message("testing") not message( "testing") or message ("testing" ) 2.4 No space at line ending. 3. Lowercase when call commands macros and functions. For eg, add_executable() not ADD_EXECUTABLE(), set() not SET(). .: * CMakeLists.txt: * Source/CMakeLists.txt: * Source/PlatformEfl.cmake: * Source/cmake/EFLHelpers.cmake: * Source/cmake/FindATK.cmake: * Source/cmake/FindCFLite.cmake: * Source/cmake/FindCairo.cmake: * Source/cmake/FindDBus.cmake: * Source/cmake/FindDirectX.cmake: * Source/cmake/FindE_DBus.cmake: * Source/cmake/FindEcore.cmake: * Source/cmake/FindEdje.cmake: * Source/cmake/FindEet.cmake: * Source/cmake/FindEeze.cmake: * Source/cmake/FindEfreet.cmake: * Source/cmake/FindEina.cmake: * Source/cmake/FindElementary.cmake: * Source/cmake/FindEnchant.cmake: * Source/cmake/FindEvas.cmake: * Source/cmake/FindFontconfig.cmake: * Source/cmake/FindGLIB.cmake: * Source/cmake/FindGStreamer.cmake: * Source/cmake/FindGperf.cmake: * Source/cmake/FindHarfBuzz.cmake: * Source/cmake/FindICU.cmake: * Source/cmake/FindLibSoup.cmake: * Source/cmake/FindQuickTimeSDK.cmake: * Source/cmake/FindSqlite.cmake: * Source/cmake/OptionsBlackBerry.cmake: * Source/cmake/OptionsCommon.cmake: * Source/cmake/OptionsEfl.cmake: * Source/cmake/OptionsWinCE.cmake: * Source/cmake/OptionsWindows.cmake: * Source/cmake/WebKitFS.cmake: * Source/cmake/WebKitFeatures.cmake: * Source/cmake/WebKitHelpers.cmake: * Source/cmake/WebKitMacros.cmake: * Source/cmake/WebKitPackaging.cmake: * Source/cmake/gtest/CMakeLists.txt: Source/JavaScriptCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * shell/CMakeLists.txt: * shell/PlatformBlackBerry.cmake: * shell/PlatformEfl.cmake: * shell/PlatformWinCE.cmake: Source/WebCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * UseJSC.cmake: * UseV8.cmake: Source/WebKit: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: Source/WebKit/efl: * DefaultTheme/CMakeLists.txt: Source/WebKit2: * CMakeLists.txt: * PlatformEfl.cmake: * win/WebKit2ExportGenerator.vcproj: * win/WebKit2ExportGeneratorCommon.vsprops: Source/WTF: * CMakeLists.txt: * wtf/CMakeLists.txt: * wtf/PlatformBlackBerry.cmake: * wtf/PlatformEfl.cmake: * wtf/PlatformWinCE.cmake: Tools: * CMakeLists.txt: * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: * DumpRenderTree/efl/CMakeLists.txt: * EWebLauncher/CMakeLists.txt: * EWebLauncher/ControlTheme/CMakeLists.txt: * MiniBrowser/efl/CMakeLists.txt: * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/PlatformEfl.cmake: * WebKitTestRunner/CMakeLists.txt: * WebKitTestRunner/PlatformEfl.cmake: * WinCELauncher/CMakeLists.txt: * clang/ReportMemoryUsagePlugin/CMakeLists.txt: Canonical link: https://commits.webkit.org/122367@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@136790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-12-06 03:10:13 +00:00
find_library(GLIB_LIBRARIES
[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. Source/JavaScriptCore: * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebCore: 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. Source/WebKit: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebKit2: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WTF: * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it. Tools: * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*. * EWebLauncher/CMakeLists.txt: Ditto. * MiniBrowser/efl/CMakeLists.txt: Ditto. * WebKitTestRunner/PlatformEfl.cmake: Ditto. Canonical link: https://commits.webkit.org/111718@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-08-13 20:38:06 +00:00
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.
[CMake] Unify coding style for CMake files https://bugs.webkit.org/show_bug.cgi?id=103605 Patch by Halton Huo <halton.huo@intel.com> on 2012-12-05 Reviewed by Laszlo Gombos. Update cmake files(.cmake, CMakeLists.txt) with following style rules: 1. Indentation 1.1 Use spaces, not tabs. 1.2 Four spaces as indent. 2. Spacing 2.1 Place one space between control statements and their parentheses. For eg, if (), else (), elseif (), endif (), foreach (), endforeach (), while (), endwhile (), break (). 2.2 Do not place spaces between function and macro statements and their parentheses. For eg, macro(), endmacro(), function(), endfunction(). 2.3 Do not place spaces between a command or function or macro and its parentheses, or between a parenthesis and its content. For eg, message("testing") not message( "testing") or message ("testing" ) 2.4 No space at line ending. 3. Lowercase when call commands macros and functions. For eg, add_executable() not ADD_EXECUTABLE(), set() not SET(). .: * CMakeLists.txt: * Source/CMakeLists.txt: * Source/PlatformEfl.cmake: * Source/cmake/EFLHelpers.cmake: * Source/cmake/FindATK.cmake: * Source/cmake/FindCFLite.cmake: * Source/cmake/FindCairo.cmake: * Source/cmake/FindDBus.cmake: * Source/cmake/FindDirectX.cmake: * Source/cmake/FindE_DBus.cmake: * Source/cmake/FindEcore.cmake: * Source/cmake/FindEdje.cmake: * Source/cmake/FindEet.cmake: * Source/cmake/FindEeze.cmake: * Source/cmake/FindEfreet.cmake: * Source/cmake/FindEina.cmake: * Source/cmake/FindElementary.cmake: * Source/cmake/FindEnchant.cmake: * Source/cmake/FindEvas.cmake: * Source/cmake/FindFontconfig.cmake: * Source/cmake/FindGLIB.cmake: * Source/cmake/FindGStreamer.cmake: * Source/cmake/FindGperf.cmake: * Source/cmake/FindHarfBuzz.cmake: * Source/cmake/FindICU.cmake: * Source/cmake/FindLibSoup.cmake: * Source/cmake/FindQuickTimeSDK.cmake: * Source/cmake/FindSqlite.cmake: * Source/cmake/OptionsBlackBerry.cmake: * Source/cmake/OptionsCommon.cmake: * Source/cmake/OptionsEfl.cmake: * Source/cmake/OptionsWinCE.cmake: * Source/cmake/OptionsWindows.cmake: * Source/cmake/WebKitFS.cmake: * Source/cmake/WebKitFeatures.cmake: * Source/cmake/WebKitHelpers.cmake: * Source/cmake/WebKitMacros.cmake: * Source/cmake/WebKitPackaging.cmake: * Source/cmake/gtest/CMakeLists.txt: Source/JavaScriptCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * shell/CMakeLists.txt: * shell/PlatformBlackBerry.cmake: * shell/PlatformEfl.cmake: * shell/PlatformWinCE.cmake: Source/WebCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * UseJSC.cmake: * UseV8.cmake: Source/WebKit: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: Source/WebKit/efl: * DefaultTheme/CMakeLists.txt: Source/WebKit2: * CMakeLists.txt: * PlatformEfl.cmake: * win/WebKit2ExportGenerator.vcproj: * win/WebKit2ExportGeneratorCommon.vsprops: Source/WTF: * CMakeLists.txt: * wtf/CMakeLists.txt: * wtf/PlatformBlackBerry.cmake: * wtf/PlatformEfl.cmake: * wtf/PlatformWinCE.cmake: Tools: * CMakeLists.txt: * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: * DumpRenderTree/efl/CMakeLists.txt: * EWebLauncher/CMakeLists.txt: * EWebLauncher/ControlTheme/CMakeLists.txt: * MiniBrowser/efl/CMakeLists.txt: * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/PlatformEfl.cmake: * WebKitTestRunner/CMakeLists.txt: * WebKitTestRunner/PlatformEfl.cmake: * WinCELauncher/CMakeLists.txt: * clang/ReportMemoryUsagePlugin/CMakeLists.txt: Canonical link: https://commits.webkit.org/122367@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@136790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-12-06 03:10:13 +00:00
get_filename_component(_GLIB_LIBRARY_DIR ${GLIB_LIBRARIES} PATH)
find_path(GLIBCONFIG_INCLUDE_DIR
[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. Source/JavaScriptCore: * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebCore: 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. Source/WebKit: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebKit2: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WTF: * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it. Tools: * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*. * EWebLauncher/CMakeLists.txt: Ditto. * MiniBrowser/efl/CMakeLists.txt: Ditto. * WebKitTestRunner/PlatformEfl.cmake: Ditto. Canonical link: https://commits.webkit.org/111718@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-08-13 20:38:06 +00:00
NAMES glibconfig.h
HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${_GLIB_LIBRARY_DIR}
${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS}
[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. Source/JavaScriptCore: * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebCore: 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. Source/WebKit: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebKit2: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WTF: * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it. Tools: * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*. * EWebLauncher/CMakeLists.txt: Ditto. * MiniBrowser/efl/CMakeLists.txt: Ditto. * WebKitTestRunner/PlatformEfl.cmake: Ditto. Canonical link: https://commits.webkit.org/111718@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-08-13 20:38:06 +00:00
PATH_SUFFIXES glib-2.0/include
)
[CMake] Unify coding style for CMake files https://bugs.webkit.org/show_bug.cgi?id=103605 Patch by Halton Huo <halton.huo@intel.com> on 2012-12-05 Reviewed by Laszlo Gombos. Update cmake files(.cmake, CMakeLists.txt) with following style rules: 1. Indentation 1.1 Use spaces, not tabs. 1.2 Four spaces as indent. 2. Spacing 2.1 Place one space between control statements and their parentheses. For eg, if (), else (), elseif (), endif (), foreach (), endforeach (), while (), endwhile (), break (). 2.2 Do not place spaces between function and macro statements and their parentheses. For eg, macro(), endmacro(), function(), endfunction(). 2.3 Do not place spaces between a command or function or macro and its parentheses, or between a parenthesis and its content. For eg, message("testing") not message( "testing") or message ("testing" ) 2.4 No space at line ending. 3. Lowercase when call commands macros and functions. For eg, add_executable() not ADD_EXECUTABLE(), set() not SET(). .: * CMakeLists.txt: * Source/CMakeLists.txt: * Source/PlatformEfl.cmake: * Source/cmake/EFLHelpers.cmake: * Source/cmake/FindATK.cmake: * Source/cmake/FindCFLite.cmake: * Source/cmake/FindCairo.cmake: * Source/cmake/FindDBus.cmake: * Source/cmake/FindDirectX.cmake: * Source/cmake/FindE_DBus.cmake: * Source/cmake/FindEcore.cmake: * Source/cmake/FindEdje.cmake: * Source/cmake/FindEet.cmake: * Source/cmake/FindEeze.cmake: * Source/cmake/FindEfreet.cmake: * Source/cmake/FindEina.cmake: * Source/cmake/FindElementary.cmake: * Source/cmake/FindEnchant.cmake: * Source/cmake/FindEvas.cmake: * Source/cmake/FindFontconfig.cmake: * Source/cmake/FindGLIB.cmake: * Source/cmake/FindGStreamer.cmake: * Source/cmake/FindGperf.cmake: * Source/cmake/FindHarfBuzz.cmake: * Source/cmake/FindICU.cmake: * Source/cmake/FindLibSoup.cmake: * Source/cmake/FindQuickTimeSDK.cmake: * Source/cmake/FindSqlite.cmake: * Source/cmake/OptionsBlackBerry.cmake: * Source/cmake/OptionsCommon.cmake: * Source/cmake/OptionsEfl.cmake: * Source/cmake/OptionsWinCE.cmake: * Source/cmake/OptionsWindows.cmake: * Source/cmake/WebKitFS.cmake: * Source/cmake/WebKitFeatures.cmake: * Source/cmake/WebKitHelpers.cmake: * Source/cmake/WebKitMacros.cmake: * Source/cmake/WebKitPackaging.cmake: * Source/cmake/gtest/CMakeLists.txt: Source/JavaScriptCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * shell/CMakeLists.txt: * shell/PlatformBlackBerry.cmake: * shell/PlatformEfl.cmake: * shell/PlatformWinCE.cmake: Source/WebCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * UseJSC.cmake: * UseV8.cmake: Source/WebKit: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: Source/WebKit/efl: * DefaultTheme/CMakeLists.txt: Source/WebKit2: * CMakeLists.txt: * PlatformEfl.cmake: * win/WebKit2ExportGenerator.vcproj: * win/WebKit2ExportGeneratorCommon.vsprops: Source/WTF: * CMakeLists.txt: * wtf/CMakeLists.txt: * wtf/PlatformBlackBerry.cmake: * wtf/PlatformEfl.cmake: * wtf/PlatformWinCE.cmake: Tools: * CMakeLists.txt: * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: * DumpRenderTree/efl/CMakeLists.txt: * EWebLauncher/CMakeLists.txt: * EWebLauncher/ControlTheme/CMakeLists.txt: * MiniBrowser/efl/CMakeLists.txt: * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/PlatformEfl.cmake: * WebKitTestRunner/CMakeLists.txt: * WebKitTestRunner/PlatformEfl.cmake: * WinCELauncher/CMakeLists.txt: * clang/ReportMemoryUsagePlugin/CMakeLists.txt: Canonical link: https://commits.webkit.org/122367@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@136790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-12-06 03:10:13 +00:00
find_path(GLIB_INCLUDE_DIR
[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. Source/JavaScriptCore: * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebCore: 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. Source/WebKit: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebKit2: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WTF: * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it. Tools: * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*. * EWebLauncher/CMakeLists.txt: Ditto. * MiniBrowser/efl/CMakeLists.txt: Ditto. * WebKitTestRunner/PlatformEfl.cmake: Ditto. Canonical link: https://commits.webkit.org/111718@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-08-13 20:38:06 +00:00
NAMES glib.h
HINTS ${PC_GLIB_INCLUDEDIR}
${PC_GLIB_INCLUDE_DIRS}
PATH_SUFFIXES glib-2.0
)
[CMake] Unify coding style for CMake files https://bugs.webkit.org/show_bug.cgi?id=103605 Patch by Halton Huo <halton.huo@intel.com> on 2012-12-05 Reviewed by Laszlo Gombos. Update cmake files(.cmake, CMakeLists.txt) with following style rules: 1. Indentation 1.1 Use spaces, not tabs. 1.2 Four spaces as indent. 2. Spacing 2.1 Place one space between control statements and their parentheses. For eg, if (), else (), elseif (), endif (), foreach (), endforeach (), while (), endwhile (), break (). 2.2 Do not place spaces between function and macro statements and their parentheses. For eg, macro(), endmacro(), function(), endfunction(). 2.3 Do not place spaces between a command or function or macro and its parentheses, or between a parenthesis and its content. For eg, message("testing") not message( "testing") or message ("testing" ) 2.4 No space at line ending. 3. Lowercase when call commands macros and functions. For eg, add_executable() not ADD_EXECUTABLE(), set() not SET(). .: * CMakeLists.txt: * Source/CMakeLists.txt: * Source/PlatformEfl.cmake: * Source/cmake/EFLHelpers.cmake: * Source/cmake/FindATK.cmake: * Source/cmake/FindCFLite.cmake: * Source/cmake/FindCairo.cmake: * Source/cmake/FindDBus.cmake: * Source/cmake/FindDirectX.cmake: * Source/cmake/FindE_DBus.cmake: * Source/cmake/FindEcore.cmake: * Source/cmake/FindEdje.cmake: * Source/cmake/FindEet.cmake: * Source/cmake/FindEeze.cmake: * Source/cmake/FindEfreet.cmake: * Source/cmake/FindEina.cmake: * Source/cmake/FindElementary.cmake: * Source/cmake/FindEnchant.cmake: * Source/cmake/FindEvas.cmake: * Source/cmake/FindFontconfig.cmake: * Source/cmake/FindGLIB.cmake: * Source/cmake/FindGStreamer.cmake: * Source/cmake/FindGperf.cmake: * Source/cmake/FindHarfBuzz.cmake: * Source/cmake/FindICU.cmake: * Source/cmake/FindLibSoup.cmake: * Source/cmake/FindQuickTimeSDK.cmake: * Source/cmake/FindSqlite.cmake: * Source/cmake/OptionsBlackBerry.cmake: * Source/cmake/OptionsCommon.cmake: * Source/cmake/OptionsEfl.cmake: * Source/cmake/OptionsWinCE.cmake: * Source/cmake/OptionsWindows.cmake: * Source/cmake/WebKitFS.cmake: * Source/cmake/WebKitFeatures.cmake: * Source/cmake/WebKitHelpers.cmake: * Source/cmake/WebKitMacros.cmake: * Source/cmake/WebKitPackaging.cmake: * Source/cmake/gtest/CMakeLists.txt: Source/JavaScriptCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * shell/CMakeLists.txt: * shell/PlatformBlackBerry.cmake: * shell/PlatformEfl.cmake: * shell/PlatformWinCE.cmake: Source/WebCore: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: * UseJSC.cmake: * UseV8.cmake: Source/WebKit: * CMakeLists.txt: * PlatformBlackBerry.cmake: * PlatformEfl.cmake: * PlatformWinCE.cmake: Source/WebKit/efl: * DefaultTheme/CMakeLists.txt: Source/WebKit2: * CMakeLists.txt: * PlatformEfl.cmake: * win/WebKit2ExportGenerator.vcproj: * win/WebKit2ExportGeneratorCommon.vsprops: Source/WTF: * CMakeLists.txt: * wtf/CMakeLists.txt: * wtf/PlatformBlackBerry.cmake: * wtf/PlatformEfl.cmake: * wtf/PlatformWinCE.cmake: Tools: * CMakeLists.txt: * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: * DumpRenderTree/efl/CMakeLists.txt: * EWebLauncher/CMakeLists.txt: * EWebLauncher/ControlTheme/CMakeLists.txt: * MiniBrowser/efl/CMakeLists.txt: * TestWebKitAPI/CMakeLists.txt: * TestWebKitAPI/PlatformEfl.cmake: * WebKitTestRunner/CMakeLists.txt: * WebKitTestRunner/PlatformEfl.cmake: * WinCELauncher/CMakeLists.txt: * clang/ReportMemoryUsagePlugin/CMakeLists.txt: Canonical link: https://commits.webkit.org/122367@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@136790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-12-06 03:10:13 +00:00
set(GLIB_INCLUDE_DIRS ${GLIB_INCLUDE_DIR} ${GLIBCONFIG_INCLUDE_DIR})
[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. Source/JavaScriptCore: * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebCore: 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. Source/WebKit: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebKit2: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WTF: * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it. Tools: * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*. * EWebLauncher/CMakeLists.txt: Ditto. * MiniBrowser/efl/CMakeLists.txt: Ditto. * WebKitTestRunner/PlatformEfl.cmake: Ditto. Canonical link: https://commits.webkit.org/111718@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-08-13 20:38:06 +00:00
# Version detection
if (EXISTS "${GLIBCONFIG_INCLUDE_DIR}/glibconfig.h")
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}")
endif ()
[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. Source/JavaScriptCore: * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebCore: 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. Source/WebKit: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebKit2: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WTF: * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it. Tools: * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*. * EWebLauncher/CMakeLists.txt: Ditto. * MiniBrowser/efl/CMakeLists.txt: Ditto. * WebKitTestRunner/PlatformEfl.cmake: Ditto. Canonical link: https://commits.webkit.org/111718@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-08-13 20:38:06 +00:00
# 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)
elseif (${_component} STREQUAL "gio-unix")
# gio-unix is compiled as part of the gio library, but the include paths
# are separate from the shared glib ones. Since this is currently only used
Fully rename WebKitGTK+ -> WebKitGTK everywhere https://bugs.webkit.org/show_bug.cgi?id=199159 Reviewed by Carlos Garcia Campos. .: * Source/cmake/FindGLIB.cmake: Source/WebCore: * accessibility/atk/WebKitAccessibleInterfaceText.cpp: (webkitAccessibleTextGetStringAtOffset): * platform/UserAgentQuirks.cpp: (WebCore::urlRequiresMacintoshPlatform): * platform/network/soup/NetworkStorageSessionSoup.cpp: (WebCore::NetworkStorageSession::saveCredentialToPersistentStorage): * rendering/RenderThemeGtk.cpp: (WebCore::RenderThemeGtk::adjustTextFieldStyle const): Source/WebKit: * UIProcess/API/glib/APIWebsiteDataStoreGLib.cpp: Source/WTF: * wtf/URLParser.cpp: (WTF::URLParser::internationalDomainNameTranscoder): Tools: * BuildSlaveSupport/gtk/README: * MiniBrowser/gtk/BrowserWindow.c: * MiniBrowser/gtk/main.c: (aboutURISchemeRequestCallback): * Scripts/webkitpy/common/config/contributionareas.py: * Scripts/webkitpy/common/config/contributors.json: * Scripts/webkitpy/tool/commands/analyzechangelog_unittest.py: * TestWebKitAPI/Tests/WebKitGLib/TestCookieManager.cpp: * TestWebKitAPI/Tests/WebKitGLib/TestResources.cpp: (testWebViewResources): * TestWebKitAPI/Tests/WebKitGLib/TestUIClient.cpp: (testWebViewMouseTarget): * TestWebKitAPI/Tests/WebKitGLib/TestWebExtensions.cpp: (testWebExtensionGetTitle): (testDocumentLoadedSignal): (testWebExtensionFormControlsAssociated): * TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp: (testWebKitSettingsUserAgent): * TestWebKitAPI/Tests/WebKitGLib/TestWebKitWebView.cpp: (testWebViewRunJavaScript): * TestWebKitAPI/Tests/WebKitGtk/InspectorTestServer.cpp: (main): * TestWebKitAPI/Tests/WebKitGtk/TestContextMenu.cpp: (prepareContextMenuTestView): (testContextMenuPopulateMenu): (testContextMenuCustomMenu): (testContextMenuDisableMenu): (testContextMenuSubMenu): (testContextMenuDismissed): (testContextMenuWebExtensionMenu): (testContextMenuWebExtensionNode): * TestWebKitAPI/Tests/WebKitGtk/TestInspector.cpp: (testInspectorDefault): (testInspectorManualAttachDetach): (testInspectorCustomContainerDestroyed): * TestWebKitAPI/Tests/WebKitGtk/TestPrinting.cpp: (testWebViewPrint): (testPrintOperationPrint): (testPrintOperationErrors): * gtk/install-dependencies: * gtk/jhbuild.modules: * gtkdoc/generate-gtkdoc: * wpe/install-dependencies: Canonical link: https://commits.webkit.org/213151@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@246790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2019-06-25 14:56:39 +00:00
# by WebKitGTK we don't go to extraordinary measures beyond pkg-config.
pkg_check_modules(GIO_UNIX QUIET gio-unix-2.0)
endif ()
endforeach ()
[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. Source/JavaScriptCore: * shell/PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebCore: 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. Source/WebKit: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WebKit2: * PlatformEfl.cmake: Use GLIB_* instead of Glib_*. Source/WTF: * wtf/PlatformEfl.cmake: Use GLIB_* instead of Glib_*, and link directly to GIO, as wtf/gobject uses functions from it. Tools: * DumpRenderTree/efl/CMakeLists.txt: Use GLIB_* instead of Glib_*. * EWebLauncher/CMakeLists.txt: Ditto. * MiniBrowser/efl/CMakeLists.txt: Ditto. * WebKitTestRunner/PlatformEfl.cmake: Ditto. Canonical link: https://commits.webkit.org/111718@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125443 268f45cc-cd09-0410-ab3c-d52691b4dbfc
2012-08-13 20:38:06 +00:00
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLIB REQUIRED_VARS GLIB_INCLUDE_DIRS GLIB_LIBRARIES ${ADDITIONAL_REQUIRED_VARS}
VERSION_VAR GLIB_VERSION)
mark_as_advanced(
GLIBCONFIG_INCLUDE_DIR
GLIB_GIO_LIBRARIES
GLIB_GIO_UNIX_LIBRARIES
GLIB_GMODULE_LIBRARIES
GLIB_GOBJECT_LIBRARIES
GLIB_GTHREAD_LIBRARIES
GLIB_INCLUDE_DIR
GLIB_INCLUDE_DIRS
GLIB_LIBRARIES
)