1. 06 Jan, 2014 1 commit
    • mrobinson@webkit.org's avatar
      [CMake] [GTK] Fix the build for the WebKitGTK+ developer configuration · 7529c73f
      mrobinson@webkit.org authored
      Reviewed by Gustavo Noronha Silva.
      * Source/cmake/FindGLIB.cmake: Add support for finding the gio-unix include directory location.
      * Source/cmake/FindGUdev.cmake: Added.
      * Source/cmake/FindGeoClue.cmake: Added.
      * Source/cmake/OptionsGTK.cmake: When gamepad is enabled look for gio-unix and GUdev. When
      geolocation is enabled look for GeoClue.
      * CMakeLists.txt: Add missing IDLS and source files to the lists.
      * PlatformGTK.cmake: Add missing include directories and source files to the lists.
      Use the GeoClue, GUdev, and gio-unix include paths and libraries and sort the list
      of WebCore include directories.
      * UseJSC.cmake: Align the sourced list with the contents of the bindings/js directory.
      * PlatformGTK.cmake: Add the geoclue platform directory to the include directory list.
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161351 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  2. 17 Dec, 2013 1 commit
    • mrobinson@webkit.org's avatar
      [GTK] [CMake] Build the plugin process against GTK+ 2 · 9073fea3
      mrobinson@webkit.org authored
      Reviewed by Gustavo Noronha Silva.
      * Source/cmake/FindGDK2.cmake: Added.
      * Source/cmake/FindGTK2.cmake: Added.
      * Source/cmake/OptionsGTK.cmake: Look for GTK2 and GDK2.
      * Source/cmake/WebKitMacros.cmake: Abstract WebKit2 IPC generation here so it
      can be shared between the WebKit2 library and the plugin process.
      * PlatformGTK.cmake: Split off the GTK+-dependent sources into
      libWebCorePlatformGTK and compile libWebCorePlatformGTK2 when
      WebKit2 is enabled.
      * CMakeLists.txt: Use the new GENERATE_WEBKIT2_MESSAGE_SOURCES macro so we
      can share messaging file generation with the plugin process.
      * PlatformGTK.cmake: Add more files to the plugin process source list. Properly
      generate message sources, add the appropriate include paths, defines, and libraries
      for the plugin process.
      * TestWebKitAPI/PlatformGTK.cmake: Add WebCorePlatformGTK to the list of
      libraries required for WebCore unit tests.
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160728 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  3. 12 May, 2013 1 commit
    • mrobinson@webkit.org's avatar
      [GTK] Add a basic cmake build for WTF and JavaScriptCore · 5ef5698a
      mrobinson@webkit.org authored
      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.
      * PlatformGTK.cmake: Added.
      * shell/PlatformGTK.cmake: Added.
      * wtf/PlatformGTK.cmake: Added.
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@149968 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  4. 05 Dec, 2012 1 commit
    • commit-queue@webkit.org's avatar
      [CMake] Unify coding style for CMake files · d6fb2c5a
      commit-queue@webkit.org authored
      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(),
      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:
      * CMakeLists.txt:
      * PlatformBlackBerry.cmake:
      * PlatformEfl.cmake:
      * PlatformWinCE.cmake:
      * shell/CMakeLists.txt:
      * shell/PlatformBlackBerry.cmake:
      * shell/PlatformEfl.cmake:
      * shell/PlatformWinCE.cmake:
      * CMakeLists.txt:
      * PlatformBlackBerry.cmake:
      * PlatformEfl.cmake:
      * PlatformWinCE.cmake:
      * UseJSC.cmake:
      * UseV8.cmake:
      * CMakeLists.txt:
      * PlatformBlackBerry.cmake:
      * PlatformEfl.cmake:
      * PlatformWinCE.cmake:
      * DefaultTheme/CMakeLists.txt:
      * CMakeLists.txt:
      * PlatformEfl.cmake:
      * win/WebKit2ExportGenerator.vcproj:
      * win/WebKit2ExportGeneratorCommon.vsprops:
      * CMakeLists.txt:
      * wtf/CMakeLists.txt:
      * wtf/PlatformBlackBerry.cmake:
      * wtf/PlatformEfl.cmake:
      * wtf/PlatformWinCE.cmake:
      * 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
  5. 11 Sep, 2012 1 commit
    • rakuco@webkit.org's avatar
      [EFL] Rewrite the EFL-related Find modules · 72080605
      rakuco@webkit.org authored
      Reviewed by Kenneth Rohde Christiansen.
      FindEFL.cmake had several problems which caused unnecessary trouble
      when building the EFL port under some setups:
      o It looked for some modules (such as ecore) more than once for no
      reason, which led to people adding libraries and include paths in
      different ways across the build system.
      o It depended on pkg-config being present for the searches to
      o It obtained the library definitions from pkg-config, so
      ${FOO_LIBRARIES} would be set to something like "foo;bar" which
      expanded to "-lfoo -lbar" to the linker. If a wrong -L<path> was
      passed before that, the wrong library installation would end up
      being picked up.
      o Due to the problem above, we also needed to set the LINK_FLAGS
      property for each target with the value of ${FOO_LDFLAGS}, which was
      also obtained from pkg-config and sort of compensated the fact that
      the libraries did not use absolute paths and added the required -L
      paths. This also included dependencies for these libraries, so we
      ended up including libraries indirectly, which is bad.
      We have now replaced that file with a set of Find-modules which are
      much more granular, each of them responsible for looking for a
      single library and its components and setting library and include
      locations the right way (with FIND_PATH() and FIND_LIBRARY()), so
      that all the problems above are fixed.
      * Source/cmake/EFLHelpers.cmake: Added.
      * Source/cmake/FindEDBus.cmake: Added.
      * Source/cmake/FindEFL.cmake: Removed.
      * Source/cmake/FindEcore.cmake: Added.
      * Source/cmake/FindEdje.cmake: Added.
      * Source/cmake/FindEeze.cmake: Added.
      * Source/cmake/FindEfreet.cmake: Added.
      * Source/cmake/FindEina.cmake: Added.
      * Source/cmake/FindEvas.cmake: Added.
      * Source/cmake/OptionsEfl.cmake:
      * CMakeLists.txt: Stop setting the LINK_FLAGS property.
      * PlatformEfl.cmake: Ditto.
      * shell/PlatformEfl.cmake: Ditto.
      * CMakeLists.txt: Stop setting the LINK_FLAGS property now that no
      port sets WebCore_LINK_FLAGS.
      * PlatformEfl.cmake: Add libraries and include directories for
      each Enlightenment Foundation Library used by the port.
      * PlatformEfl.cmake: Stop setting the LINK_FLAGS property and add
      libraries and include directories for each Enlightenment
      Foundation Library used by the port.
      * CMakeLists.txt: Stop setting the LINK_FLAGS property.
      * PlatformEfl.cmake: Add libraries and include directories for
      each Enlightenment Foundation Library used by the port.
      * CMakeLists.txt: Stop setting the LINK_FLAGS property.
      * PlatformEfl.cmake: Add libraries and include directories for
      each Enlightenment Foundation Library used by the port.
      * DumpRenderTree/efl/CMakeLists.txt: Stop setting the LINK_FLAGS
      property and include all the Enlightenment Foundation Libraries
      required by the target.
      * EWebLauncher/CMakeLists.txt: Ditto.
      * MiniBrowser/efl/CMakeLists.txt: Ditto.
      * TestWebKitAPI/PlatformEfl.cmake: Add missing include directories
      now that they are not added implicitly.
      * WebKitTestRunner/CMakeLists.txt: Stop setting the LINK_FLAGS
      * WebKitTestRunner/PlatformEfl.cmake: Stop setting the LINK_FLAGS
      property and include all the Enlightenment Foundation Libraries
      required by the target.
      git-svn-id: http://svn.webkit.org/repository/webkit/trunk@128191 268f45cc-cd09-0410-ab3c-d52691b4dbfc