Title: [225168] trunk
- Revision
- 225168
- Author
- ape...@igalia.com
- Date
- 2017-11-27 07:34:49 -0800 (Mon, 27 Nov 2017)
Log Message
[CMake] Values of CMAKE_BUILD_TYPE from toolchain file are ignored
https://bugs.webkit.org/show_bug.cgi?id=179971
Reviewed by Carlos Alberto Lopez Perez.
* CMakeLists.txt: Call project() first, as it loads the toolchain
file, so that's done before checking CMAKE_BUILD_TYPE.
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (225167 => 225168)
--- trunk/CMakeLists.txt 2017-11-27 14:16:53 UTC (rev 225167)
+++ trunk/CMakeLists.txt 2017-11-27 15:34:49 UTC (rev 225168)
@@ -1,8 +1,17 @@
# -----------------------------------------------------------------------------
# Determine CMake version and build type.
# -----------------------------------------------------------------------------
+#
+# NOTE: cmake_minimum_required() and project() *MUST* be the two fist commands
+# used, see https://cmake.org/cmake/help/v3.3/command/project.html -- the
+# latter in particular handles loading a bunch of shared CMake definitions
+# and loading the cross-compilation settings from CMAKE_TOOLCHAIN_FILE.
+#
+
cmake_minimum_required(VERSION 3.3)
+project(WebKit)
+
if (NOT CMAKE_BUILD_TYPE)
message(WARNING "No CMAKE_BUILD_TYPE value specified, defaulting to RelWithDebInfo.")
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build." FORCE)
@@ -10,8 +19,6 @@
message(STATUS "The CMake build type is: ${CMAKE_BUILD_TYPE}")
endif ()
-project(WebKit)
-
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/Source/cmake")
set(ENABLE_WEBCORE ON)
Modified: trunk/ChangeLog (225167 => 225168)
--- trunk/ChangeLog 2017-11-27 14:16:53 UTC (rev 225167)
+++ trunk/ChangeLog 2017-11-27 15:34:49 UTC (rev 225168)
@@ -1,3 +1,13 @@
+2017-11-27 Adrian Perez de Castro <ape...@igalia.com>
+
+ [CMake] Values of CMAKE_BUILD_TYPE from toolchain file are ignored
+ https://bugs.webkit.org/show_bug.cgi?id=179971
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * CMakeLists.txt: Call project() first, as it loads the toolchain
+ file, so that's done before checking CMAKE_BUILD_TYPE.
+
2017-11-22 Michael Catanzaro <mcatanz...@igalia.com>
Sanity-check feature defaults in WebKitFeatures.cmake
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
