2011-01-25 Patrick Gansterer <paroga@webkit.org>

        Reviewed by Adam Barth.

        Move main CMakeLists.txt into Source directory
        https://bugs.webkit.org/show_bug.cgi?id=52888

        * CMakeLists.txt: Removed.
        * Source/CMakeLists.txt: Copied from CMakeLists.txt.
        * Source/cmakeconfig.h.cmake: Copied from cmakeconfig.h.cmake.
        * cmakeconfig.h.cmake: Removed.
2011-01-25  Patrick Gansterer  <paroga@webkit.org>

        Reviewed by Adam Barth.

        Move main CMakeLists.txt into Source directory
        https://bugs.webkit.org/show_bug.cgi?id=52888

        * Scripts/webkitdirs.pm:

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

diff --git a/ChangeLog b/ChangeLog
index 414a739376f9da0550f423e5c687459908040755..fe7d46cbcd2a52eedb9fa314f3508ecc647993a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-25  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Move main CMakeLists.txt into Source directory
+        https://bugs.webkit.org/show_bug.cgi?id=52888
+
+        * CMakeLists.txt: Removed.
+        * Source/CMakeLists.txt: Copied from CMakeLists.txt.
+        * Source/cmakeconfig.h.cmake: Copied from cmakeconfig.h.cmake.
+        * cmakeconfig.h.cmake: Removed.
+
 2011-01-24  Chris Marrin  <cmarrin@apple.com>
 
         Reviewed by Eric Seidel.

diff --git a/CMakeLists.txt b/Source/CMakeLists.txt
similarity index 92%
rename from CMakeLists.txt
rename to Source/CMakeLists.txt
index 8b1cb1b4052bf2889ae90b7443087c11e1263450..13ea13c8f35224bd607f9860498b5f98b39f3e83 100644 (file)
--- a/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -7,12 +7,12 @@ PROJECT(WebKit)
 IF (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_C_FLAGS AND NOT CMAKE_CXX_FLAGS)
     SET(CMAKE_BUILD_TYPE Release)
 ENDIF ()
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/Source/JavaScriptCore")
-SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/Source/WebCore")
-SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/Source/WebKit")
-SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
+SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
+SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
+SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
+SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/../Tools")
 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 
 INCLUDE(WebKitMacros)
@@ -104,9 +104,9 @@ INCLUDE(WebKitPackaging)
 # -----------------------------------------------------------------------------
 # Add module directories
 # -----------------------------------------------------------------------------
-ADD_SUBDIRECTORY(Source/JavaScriptCore)
-ADD_SUBDIRECTORY(Source/WebCore)
-ADD_SUBDIRECTORY(Source/WebKit)
+ADD_SUBDIRECTORY(JavaScriptCore)
+ADD_SUBDIRECTORY(WebCore)
+ADD_SUBDIRECTORY(WebKit)
 
 # -----------------------------------------------------------------------------
 # Add test browser if exists

diff --git a/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
similarity index 100%
rename from cmakeconfig.h.cmake
rename to Source/cmakeconfig.h.cmake

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 67c2bd71b7adbcda3c6f55d1d1cad7a6cf30fc33..c5f7178dd757802d7089fcefff4605a2633f4193 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-25  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Move main CMakeLists.txt into Source directory
+        https://bugs.webkit.org/show_bug.cgi?id=52888
+
+        * Scripts/webkitdirs.pm:
+
 2011-01-25  Patrick Gansterer  <paroga@webkit.org>
 
         Reviewed by Eric Seidel.

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index e7c57d643fdb1a0cc50e5956bb071acb05198ba0..1272bb8890b5c22207a4877c116cc40b2c072b1a 100644 (file)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -1501,7 +1501,7 @@ sub buildCMakeProject($@)
             push @buildArgs, "-DCMAKE_BUILD_TYPE=Release";
         }
 
-        push @buildArgs, sourceDir();
+        push @buildArgs, sourceDir() . "/Source";
 
         $dir = File::Spec->catfile($dir, $config);
         File::Path::mkpath($dir);