Title: [226116] releases/WebKitGTK/webkit-2.18
- Revision
- 226116
- Author
- [email protected]
- Date
- 2017-12-19 00:17:33 -0800 (Tue, 19 Dec 2017)
Log Message
Merge r225168 - [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: releases/WebKitGTK/webkit-2.18/CMakeLists.txt (226115 => 226116)
--- releases/WebKitGTK/webkit-2.18/CMakeLists.txt 2017-12-19 08:16:28 UTC (rev 226115)
+++ releases/WebKitGTK/webkit-2.18/CMakeLists.txt 2017-12-19 08:17:33 UTC (rev 226116)
@@ -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: releases/WebKitGTK/webkit-2.18/ChangeLog (226115 => 226116)
--- releases/WebKitGTK/webkit-2.18/ChangeLog 2017-12-19 08:16:28 UTC (rev 226115)
+++ releases/WebKitGTK/webkit-2.18/ChangeLog 2017-12-19 08:17:33 UTC (rev 226116)
@@ -1,3 +1,13 @@
+2017-11-27 Adrian Perez de Castro <[email protected]>
+
+ [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-15 Carlos Garcia Campos <[email protected]>
[WPE] Add initial support for WebDriver
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
