Commits · master · App_Technologies / webkit

13 Jan, 2014 1 commit

[CMake] Mark all dependency include paths and libraries as advanced variables · 3770244d

mrobinson@webkit.org authored Jan 14, 2014

https://bugs.webkit.org/show_bug.cgi?id=126504

Reviewed by Daniel Bates.

.:

* Source/cmake/FindATK.cmake: Mark result variable as advanced.
* Source/cmake/FindCairo.cmake: Ditto.
* Source/cmake/FindEGL.cmake: Ditto.
* Source/cmake/FindEnchant.cmake: Ditto.
* Source/cmake/FindGLIB.cmake: Ditto.
* Source/cmake/FindGStreamer.cmake: Ditto.
* Source/cmake/FindHarfBuzz.cmake: Ditto.
* Source/cmake/FindLibSoup.cmake: Ditto.

Source/WebKit2:

* CMakeLists.txt: Mark the LIBRT_LIBRARIES variable as advanced.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

3770244d

29 Nov, 2013 1 commit

[cmake] Fix cmake warning: Argument not separated from preceding token by whitespace · ca8c07ef

commit-queue@webkit.org authored Nov 29, 2013

https://bugs.webkit.org/show_bug.cgi?id=124899

Patch by Laszlo Vidacs <lac@inf.u-szeged.hu> on 2013-11-29
Reviewed by Gyuyoung Kim.

* Source/cmake/FindCairo.cmake:
* Source/cmake/FindGStreamer.cmake:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159866 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ca8c07ef

17 Oct, 2013 1 commit

[CMAKE] Update code to take advantage of CMake version 2.8.3+. · c376f089

commit-queue@webkit.org authored Oct 17, 2013

https://bugs.webkit.org/show_bug.cgi?id=97516

Patch by Afonso R. Costa Jr. <afonso.costa@samsung.com> on 2013-10-17
Reviewed by Gyuyoung Kim.

CMake's version was changed to 2.8.3. So, these files below
can be simplified to take advantage of CMake's new version.

* Source/cmake/FindCairo.cmake: Simplified according to CMake 2.8.3+.
* Source/cmake/FindGStreamer.cmake: Ditto.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157562 268f45cc-cd09-0410-ab3c-d52691b4dbfc

c376f089

05 Dec, 2012 1 commit

[CMake] Unify coding style for CMake files · d6fb2c5a

commit-queue@webkit.org authored Dec 06, 2012

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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136790 268f45cc-cd09-0410-ab3c-d52691b4dbfc

d6fb2c5a

03 May, 2012 1 commit

[CMake] Rewrite FindCairo.cmake. · fb7fec1d

rakuco@webkit.org authored May 04, 2012

https://bugs.webkit.org/show_bug.cgi?id=84895

Reviewed by Daniel Bates.

The old approach relied on pkg-config for finding Cairo (which
introduced a dependency on pkg-config that could be avoided), used
the LibFindMacros code that we should probably remove in the
future and did not use the FindPackageHandleStandardArguments
module.

Change all that by rewriting the module.
- Use the pkg-config output optionally instead of requiring it
like LibFindMacros did.
- Remove the implicit dependency on FreeType which often found it
the wrong way via pkg-config and without considering
CMAKE_PREFIX_PATH.
- Retrieve the Cairo version by looking at cairo-version.h instead
of relying on pkg-config. It requires some additional code for
checking if the desired version has been found, but that will not
be needed once we start depending on CMake 2.8.3 or later.

The only downside is that FPHSA sets <UPPERCASED_NAME>_FOUND
instead of <Name>_FOUND, and to keep things consistent
Cairo_LIBRARIES and Cairo_INCLUDE_DIRS have become CAIRO_LIBRARIES
and CAIRO_INCLUDE_DIRS.

* Source/cmake/FindCairo.cmake:

Source/WebCore:

No new tests, build system change.

* PlatformEfl.cmake: Use CAIRO_FOO instead of Cairo_FOO.

Source/WebKit:

* PlatformEfl.cmake: Use CAIRO_FOO instead of Cairo_FOO.

Source/WebKit2:

* PlatformEfl.cmake: Use CAIRO_FOO instead of Cairo_FOO.

Tools:

* DumpRenderTree/efl/CMakeLists.txt: Use CAIRO_FOO instead of
Cairo_FOO.
* EWebLauncher/CMakeLists.txt: Ditto.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@116049 268f45cc-cd09-0410-ab3c-d52691b4dbfc

fb7fec1d

26 Sep, 2011 1 commit

[CMake] Remove FindFreetype.cmake · 64415dd9

commit-queue@webkit.org authored Sep 26, 2011

https://bugs.webkit.org/show_bug.cgi?id=68778

Patch by Raphael Kubo da Costa <kubo@profusion.mobi> on 2011-09-26
Reviewed by Adam Barth.

CMake has provided its own FindFreetype.cmake forever, so there is no
need to have another implementation in WebKit.

.:

* Source/cmake/FindCairo.cmake: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS}
instead of Freetype_{LIBRARIES,INCLUDE_DIRS}.
* Source/cmake/FindFreetype.cmake: Removed.
* Source/cmake/FindPango.cmake: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS}
instead of Freetype_{LIBRARIES,INCLUDE_DIRS}.
* Source/cmake/OptionsEfl.cmake: Remove minimum required version
check, it has never been checked and Freetype 2.1.10 from 2005 is
already > 9.0.

Source/WebCore:

No new tests, just a buildsystem change.

* CMakeListsEfl.txt: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} instead of
Freetype_{LIBRARIES,INCLUDE_DIRS}.

Source/WebKit/efl:

* CMakeListsEfl.txt: Use FREETYPE_{LIBRARIES,INCLUDE_DIRS} instead of
Freetype_{LIBRARIES,INCLUDE_DIRS}.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95998 268f45cc-cd09-0410-ab3c-d52691b4dbfc

64415dd9

17 Sep, 2011 1 commit

[EFL] Bump minimum requirement for cairo to 1.10. · 21ce86bc

ryuan.choi@samsung.com authored Sep 17, 2011

https://bugs.webkit.org/show_bug.cgi?id=68226

Reviewed by Adam Barth.

* Source/cmake/FindCairo.cmake: Check required version.
* Source/cmake/OptionsEfl.cmake:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@95379 268f45cc-cd09-0410-ab3c-d52691b4dbfc

21ce86bc

01 Jan, 2011 1 commit

Move Sources to Source · c2a176a3

abarth@webkit.org authored Jan 02, 2011

https://bugs.webkit.org/show_bug.cgi?id=51794

Reviewed by Eric Seidel.

Update build files to point to the new location.

* CMakeLists.txt:
* GNUmakefile.am:
* Makefile:
* autogen.sh:
* configure.ac:

Tools: 

Update scripts to point to the new location.

* Scripts/build-webkit:
* Scripts/do-file-rename:
* Scripts/do-webcore-rename:
* Scripts/webkitpy/common/config/build.py:
* Scripts/webkitpy/common/config/build_unittest.py:

Websites/bugs.webkit.org: 

* PrettyPatch/PrettyPatch.rb:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74852 268f45cc-cd09-0410-ab3c-d52691b4dbfc

c2a176a3

27 Dec, 2010 1 commit

2010-12-26 Adam Barth <abarth@webkit.org> · e6c5b118

abarth@webkit.org authored Dec 27, 2010

        Reviewed by Eric Seidel.

        Move cmake into Sources
        https://bugs.webkit.org/show_bug.cgi?id=51631

        * PrettyPatch/PrettyPatch.rb:
2010-12-26  Adam Barth  <abarth@webkit.org>

        Reviewed by Eric Seidel.

        Move cmake into Sources
        https://bugs.webkit.org/show_bug.cgi?id=51631

        * CMakeLists.txt:
        * Sources/cmake: Copied from cmake.
        * cmake: Removed.
        * cmake/FindCFLite.cmake: Removed.
        * cmake/FindCairo.cmake: Removed.
        * cmake/FindEFL.cmake: Removed.
        * cmake/FindFontconfig.cmake: Removed.
        * cmake/FindFreetype.cmake: Removed.
        * cmake/FindGDK-PixBuf.cmake: Removed.
        * cmake/FindGDK.cmake: Removed.
        * cmake/FindGIO.cmake: Removed.
        * cmake/FindGStreamer-App.cmake: Removed.
        * cmake/FindGStreamer-Base.cmake: Removed.
        * cmake/FindGStreamer-Interfaces.cmake: Removed.
        * cmake/FindGStreamer-Pbutils.cmake: Removed.
        * cmake/FindGStreamer-Plugins-Base.cmake: Removed.
        * cmake/FindGStreamer-Video.cmake: Removed.
        * cmake/FindGStreamer.cmake: Removed.
        * cmake/FindGlib.cmake: Removed.
        * cmake/FindGperf.cmake: Removed.
        * cmake/FindGthread.cmake: Removed.
        * cmake/FindICU.cmake: Removed.
        * cmake/FindLibSoup2.cmake: Removed.
        * cmake/FindLibXlst.cmake: Removed.
        * cmake/FindPango.cmake: Removed.
        * cmake/FindSqlite.cmake: Removed.
        * cmake/LibFindMacros.cmake: Removed.
        * cmake/OptionsCommon.cmake: Removed.
        * cmake/OptionsEfl.cmake: Removed.
        * cmake/OptionsWinCE.cmake: Removed.
        * cmake/OptionsWindows.cmake: Removed.
        * cmake/WebKitEfl.cmake: Removed.
        * cmake/WebKitFS.cmake: Removed.
        * cmake/WebKitFeatures.cmake: Removed.
        * cmake/WebKitHelpers.cmake: Removed.
        * cmake/WebKitMacros.cmake: Removed.
        * cmake/WebKitPackaging.cmake: Removed.
        * cmake/eflsymbols.filter: Removed.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74676 268f45cc-cd09-0410-ab3c-d52691b4dbfc

e6c5b118

03 Dec, 2010 1 commit

2010-12-02 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> · 2eaa7158

commit-queue@webkit.org authored Dec 03, 2010

        Reviewed by Eric Seidel.

        [EFL] Fails to build with non-system cairo
        https://bugs.webkit.org/show_bug.cgi?id=50395

        Do not add 'cairo' as a suffix for the paths provided by
        pkgconfig. The paths provided by pkgconfig already include it.

        * cmake/FindCairo.cmake:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73242 268f45cc-cd09-0410-ab3c-d52691b4dbfc

2eaa7158

15 May, 2010 1 commit

2010-05-15 Leandro Pereira <leandro@profusion.mobi> · d99f85b6

eric@webkit.org authored May 15, 2010

        Reviewed by Adam Treat.

        [EFL] Add build system for the EFL port.
        http://webkit.org/b/37945

        * CMakeLists.txt: Added.
        * cmake/FindCFLite.cmake: Added.
        * cmake/FindCairo.cmake: Added.
        * cmake/FindEFL.cmake: Added.
        * cmake/FindFreetype.cmake: Added.
        * cmake/FindGDK-PixBuf.cmake: Added.
        * cmake/FindGDK.cmake: Added.
        * cmake/FindGIO.cmake: Added.
        * cmake/FindGlib.cmake: Added.
        * cmake/FindICU.cmake: Added.
        * cmake/FindLibSoup2.cmake: Added.
        * cmake/FindLibXlst.cmake: Added.
        * cmake/FindPango.cmake: Added.
        * cmake/FindSqlite.cmake: Added.
        * cmake/LibFindMacros.cmake: Added.
        * cmake/OptionsCommon.cmake: Added.
        * cmake/OptionsEfl.cmake: Added.
        * cmake/WebKitEfl.cmake: Added.
        * cmake/WebKitFS.cmake: Added.
        * cmake/WebKitFeatures.cmake: Added.
        * cmake/WebKitGenerators.cmake: Added.
        * cmake/WebKitHelpers.cmake: Added.
        * cmake/WebKitMacros.cmake: Added.
        * cmakeconfig.h.cmake: Added.
2010-05-15  Leandro Pereira  <leandro@profusion.mobi>

        Reviewed by Adam Treat.

        [EFL] Add build system for the EFL port.
        http://webkit.org/b/37945

        * CMakeLists.txt: Added.
        * CMakeListsEfl.txt: Added.
        * config.h: Add conditional to look for cmakeconfig.h.
        * jsc/CMakeLists.txt: Added.
        * jsc/CMakeListsEfl.txt: Added.
        * wtf/CMakeLists.txt: Added.
        * wtf/CMakeListsEfl.txt: Added.
2010-05-15  Leandro Pereira  <leandro@profusion.mobi>

        Reviewed by Adam Treat.

        [EFL] Add build system for the EFL port.
        http://webkit.org/b/37945

        * CMakeLists.txt: Added.
        * CMakeListsEfl.txt: Added.
        * config.h: Add conditional to look for cmakeconfig.h.
2010-05-15  Leandro Pereira  <leandro@profusion.mobi>

        Reviewed by Adam Treat.

        [EFL] Add build system for the EFL port.
        http://webkit.org/b/37945

        * CMakeLists.txt: Added.
        * CMakeListsEfl.txt: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@59537 268f45cc-cd09-0410-ab3c-d52691b4dbfc

d99f85b6