From: paroga@webkit.org Date: Sun, 14 Oct 2012 14:58:43 +0000 (+0000) Subject: Unreviewed, rolling out r130656. X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=f916fa2c33a24191246a08d3840af4ce44c40719 Unreviewed, rolling out r130656. http://trac.webkit.org/changeset/130656 https://bugs.webkit.org/show_bug.cgi?id=97592 Broke CMake build on Windows * CMakeLists.txt: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@131266 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0196ae24ba29..a91f25599b09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,17 +57,12 @@ STRING(TOLOWER ${PORT} WEBKIT_PORT_DIR) # ----------------------------------------------------------------------------- # Find common packages (used by all ports) # ----------------------------------------------------------------------------- -FIND_PACKAGE(BISON 2.4.1 REQUIRED) -FIND_PACKAGE(FLEX 2.5.34 REQUIRED) - -# TODO Enforce version requirement for gperf -FIND_PACKAGE(Gperf 3.0.3 REQUIRED) - -# Perl version check enforced using cmake version 2.8.8+ -FIND_PACKAGE(Perl 5.10.0 REQUIRED) - -FIND_PACKAGE(PythonInterp 2.6.0 REQUIRED) -FIND_PACKAGE(Ruby 1.8.7) +FIND_PACKAGE(BISON REQUIRED) +FIND_PACKAGE(FLEX REQUIRED) +FIND_PACKAGE(Gperf REQUIRED) +FIND_PACKAGE(Perl REQUIRED) +FIND_PACKAGE(PythonInterp REQUIRED) +FIND_PACKAGE(Ruby) # ----------------------------------------------------------------------------- # Determine the target processor diff --git a/ChangeLog b/ChangeLog index fe059bef0f5c..000fdd2d8d59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-10-14 Patrick Gansterer + + Unreviewed, rolling out r130656. + http://trac.webkit.org/changeset/130656 + https://bugs.webkit.org/show_bug.cgi?id=97592 + + Broke CMake build on Windows + + * CMakeLists.txt: + 2012-10-12 Sheriff Bot Unreviewed, rolling out r131189.