[CMake] Values of CMAKE_BUILD_TYPE from toolchain file are ignored
authoraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 27 Nov 2017 15:34:49 +0000 (15:34 +0000)
committeraperez@igalia.com <aperez@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 27 Nov 2017 15:34:49 +0000 (15:34 +0000)
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.

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

CMakeLists.txt
ChangeLog

index 706e1b3..05b0579 100644 (file)
@@ -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 @@ else ()
     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)
index afc9e8c..4ca1469 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-11-27  Adrian Perez de Castro  <aperez@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  <mcatanzaro@igalia.com>
 
         Sanity-check feature defaults in WebKitFeatures.cmake