+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.
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)
# -----------------------------------------------------------------------------
# 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
+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.
push @buildArgs, "-DCMAKE_BUILD_TYPE=Release";
}
- push @buildArgs, sourceDir();
+ push @buildArgs, sourceDir() . "/Source";
$dir = File::Spec->catfile($dir, $config);
File::Path::mkpath($dir);