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

12 May, 2013 1 commit

[GTK] Add a basic cmake build for WTF and JavaScriptCore · 5ef5698a

mrobinson@webkit.org authored May 12, 2013

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

Reviewed by Laszlo Gombos.

.:

* CMakeLists.txt: Add GTK+ to the list of ports.
* Source/CMakeLists.txt: We do not try to build WebCoreTestSupport when WebCore is disabled.
* Source/cmake/FindGAIL3.cmake: Added.
* Source/cmake/FindGDK3.cmake: Added.
* Source/cmake/FindGStreamer.cmake: Use the passed in minimum version.
* Source/cmake/FindGTK3.cmake: Added.
* Source/cmake/FindXt.cmake: Added.
* Source/cmake/OptionsEfl.cmake: Pass in the minimum version.
* Source/cmake/OptionsGTK.cmake: Added.

Source/JavaScriptCore:

* PlatformGTK.cmake: Added.
* shell/PlatformGTK.cmake: Added.

Source/WTF:

* wtf/PlatformGTK.cmake: Added.

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

5ef5698a

10 Jan, 2013 1 commit

[EFL] Add gstreamer 1.0.5 to jhbuild · 2f02b164

christophe.dumez@intel.com authored Jan 10, 2013

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

Reviewed by Laszlo Gombos.

.:

Update EFL CMake configuration to require gstreamer
1.0.5.

* Source/cmake/FindGStreamer.cmake:
* Source/cmake/OptionsEfl.cmake:

Source/WebCore:

Remove GSTREAMER_INTERFACES_LIBRARIES from EFL
CMake configuration.

No new tests, no behavior change for layout tests.

* PlatformEfl.cmake:

Source/WebKit:

Remove GSTREAMER_INTERFACES_LIBRARIES from EFL
CMake configuration.

* PlatformEfl.cmake:

Source/WebKit/efl:

Fix compilation error when using gstreamer 1.0.

* WebCoreSupport/FullscreenVideoControllerEfl.cpp:
* WebCoreSupport/FullscreenVideoControllerEfl.h:

Tools:

Add gstreamer 1.0.5 to EFL's jhbuild configuration.

* efl/jhbuild.modules:

LayoutTests:

Skip several media tests that are crashing with gstreamer 1.0.

* platform/efl/TestExpectations:
* platform/efl/media/sources-fallback-codecs-expected.txt: Removed.


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

2f02b164

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

08 May, 2012 2 commits

[CMake] FindGStreamer: Fix the build with static WebCore. · 4c24e99c

rakuco@webkit.org authored May 09, 2012

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

Reviewed by Daniel Bates.

.:

Building WebCore statically was failing because files in
WebCore/platform/gstreamer when ENABLE_VIDEO was set required
gstreamer-base, which was not being linked to after r116453.

Fix that by looking for gstreamer-base, requiring and linking
against it if GStreamer is used.

* Source/cmake/FindGStreamer.cmake:

Source/WebCore:

No new tests, build fix.

Building WebCore statically was failing because files in
WebCore/platform/gstreamer when ENABLE_VIDEO was set required
gstreamer-base, which was not being linked to after r116453.

Fix that by looking for gstreamer-base, requiring and linking
against it if GStreamer is used.

* PlatformEfl.cmake: Link to GSTREAMER_LIBRARIES and
GSTREAMER_BASE_LIBRARIES, and include GSTREAMER_INCLUDE_DIRS and
GSTREAMER_BASE_INCLUDE_DIRS.

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

4c24e99c

[CMake] Rewrite FindGStreamer.cmake. · ac4c4463

rakuco@webkit.org authored May 08, 2012

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

Reviewed by Daniel Bates.

.:

We are currently kind of duplicating the same
FindGStreamer-Foo.cmake file whenever a new GStreamer plugin needs
to be found. Besides this approach not scaling very well, it
relies on pkg-config for version checking, uses the LibFindMacros
package that we should deprecate and all the find files could be
merged into one, with users using the COMPONENTS feature of the
FIND_PACKAGE() call to find the desired plugins.

FindGStreamer.cmake has then been rewritten to take all that into
account:
- The LibFindMacros.cmake package is not used anymore.
- Version check is performed in the CMake file itself by parsing
the gstversion.h header.
- All GStreamer plugins are searched and the COMPONENTS keyword
used in the FIND_PACKAGE() call is used to check which plugins are
required.
- The plugins-base and base GStreamer plugins are not searched, as
they were not used anywhere in the build system.

* Source/cmake/FindGStreamer-App.cmake: Removed.
* Source/cmake/FindGStreamer-Audio.cmake: Removed.
* Source/cmake/FindGStreamer-Base.cmake: Removed.
* Source/cmake/FindGStreamer-FFT.cmake: Removed.
* Source/cmake/FindGStreamer-Interfaces.cmake: Removed.
* Source/cmake/FindGStreamer-Pbutils.cmake: Removed.
* Source/cmake/FindGStreamer-Plugins-Base.cmake: Removed.
* Source/cmake/FindGStreamer-Video.cmake: Removed.
* Source/cmake/FindGStreamer.cmake: Rewrite as described above.
* Source/cmake/OptionsEfl.cmake: Use COMPONENTS to specify which
GStreamer plugins to look for.

Source/WebCore:

No new tests, build system change.

We are currently kind of duplicating the same
FindGStreamer-Foo.cmake file whenever a new GStreamer plugin needs
to be found. Besides this approach not scaling very well, it
relies on pkg-config for version checking, uses the LibFindMacros
package that we should deprecate and all the find files could be
merged into one, with users using the COMPONENTS feature of the
FIND_PACKAGE() call to find the desired plugins.

FindGStreamer.cmake has then been rewritten to take all that into
account:
- The LibFindMacros.cmake package is not used anymore.
- Version check is performed in the CMake file itself by parsing
the gstversion.h header.
- All GStreamer plugins are searched and the COMPONENTS keyword
used in the FIND_PACKAGE() call is used to check which plugins are
required.
- The plugins-base and base GStreamer plugins are not searched, as
they were not used anywhere in the build system.

* PlatformEfl.cmake: Update GStreamer-related variable names.

Source/WebKit:

We are currently kind of duplicating the same
FindGStreamer-Foo.cmake file whenever a new GStreamer plugin needs
to be found. Besides this approach not scaling very well, it
relies on pkg-config for version checking, uses the LibFindMacros
package that we should deprecate and all the find files could be
merged into one, with users using the COMPONENTS feature of the
FIND_PACKAGE() call to find the desired plugins.

FindGStreamer.cmake has then been rewritten to take all that into
account:
- The LibFindMacros.cmake package is not used anymore.
- Version check is performed in the CMake file itself by parsing
the gstversion.h header.
- All GStreamer plugins are searched and the COMPONENTS keyword
used in the FIND_PACKAGE() call is used to check which plugins are
required.
- The plugins-base and base GStreamer plugins are not searched, as
they were not used anywhere in the build system.

* PlatformEfl.cmake: Update GStreamer-related variable names.

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

ac4c4463

20 Feb, 2012 1 commit

[CMAKE] Check gstreamer minimum required version. · 9cf003c4

gyuyoung.kim@samsung.com authored Feb 20, 2012

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

Reviewed by Daniel Bates.

To enable video, Gstreamer version requires to be above 0.10.30.
This patch checks whether Gstreamer version is greater than 0.10.30.

* Source/cmake/FindGStreamer-App.cmake:
* Source/cmake/FindGStreamer-Base.cmake:
* Source/cmake/FindGStreamer-Interfaces.cmake:
* Source/cmake/FindGStreamer-Pbutils.cmake:
* Source/cmake/FindGStreamer-Plugins-Base.cmake:
* Source/cmake/FindGStreamer-Video.cmake:
* Source/cmake/FindGStreamer.cmake:


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

9cf003c4

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

08 Sep, 2010 1 commit

2010-09-08 Gyuyoung Kim <gyuyoung.kim@samsung.com> · 8cded870

commit-queue@webkit.org authored Sep 08, 2010

        Reviewed by Kenneth Rohde Christiansen.

        [EFL] Support to enable HTML5's Video based on gstreamer in WebKit-EFL
        https://bugs.webkit.org/show_bug.cgi?id=44098

        To support video of HTML5 based on gstreamer, add cmake files for gstreamer.

        * cmake/FindGStreamer-App.cmake: Added.
        * cmake/FindGStreamer-Base.cmake: Added.
        * cmake/FindGStreamer-Interfaces.cmake: Added.
        * cmake/FindGStreamer-Pbutils.cmake: Added.
        * cmake/FindGStreamer-Plugins-Base.cmake: Added.
        * cmake/FindGStreamer-Video.cmake: Added.
        * cmake/FindGStreamer.cmake: Added.
        * cmake/OptionsEfl.cmake:
2010-09-08  Gyuyoung Kim  <gyuyoung.kim@samsung.com>

        Reviewed by Kenneth Rohde Christiansen.

        [EFL] Support to enable HTML5's Video based on gstreamer in WebKit-EFL
        https://bugs.webkit.org/show_bug.cgi?id=44098

        To support video of HTML5 based on gstreamer, add files regarding gstreamer to
        CMakeListsEfl.txt.

        * CMakeListsEfl.txt:

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

8cded870