Changeset 76656 in webkit

Timestamp:

Jan 25, 2011 5:17:17 PM (13 years ago)

Author:

Patrick Gansterer

Message:

2011-01-25 Patrick Gansterer <Patrick Gansterer>

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 <Patrick Gansterer>

Reviewed by Adam Barth.

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

• Scripts/webkitdirs.pm:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/CMakeLists.txt (moved) (moved from trunk/CMakeLists.txt) (2 diffs)
• Source/cmakeconfig.h.cmake (moved) (moved from trunk/cmakeconfig.h.cmake) (1 prop)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitdirs.pm (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/CMakeLists.txt

@@ -8 +8 @@
     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")
 
@@ -105 +105 @@
 # Add module directories
 # -----------------------------------------------------------------------------
-ADD_SUBDIRECTORY(Source/JavaScriptCore)
-ADD_SUBDIRECTORY(Source/WebCore)
-ADD_SUBDIRECTORY(Source/WebKit)
+ADD_SUBDIRECTORY(JavaScriptCore)
+ADD_SUBDIRECTORY(WebCore)
+ADD_SUBDIRECTORY(WebKit)
 
 # -----------------------------------------------------------------------------

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1502 +1502 @@
         }
 
-        push @buildArgs, sourceDir();
+        push @buildArgs, sourceDir() . "/Source";
 
         $dir = File::Spec->catfile($dir, $config);