Title: [216311] releases/WebKitGTK/webkit-2.16
- Revision
- 216311
- Author
- carlo...@webkit.org
- Date
- 2017-05-06 01:08:39 -0700 (Sat, 06 May 2017)
Log Message
Merge r215001 - [GTK] Build fails when using icecream, ccache and cmake 3.6
https://bugs.webkit.org/show_bug.cgi?id=170498
Reviewed by Michael Catanzaro.
Disable ninja response file when using icecream, ccache and cmake > 3.5.
* Source/cmake/OptionsCommon.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/ChangeLog (216310 => 216311)
--- releases/WebKitGTK/webkit-2.16/ChangeLog 2017-05-06 08:08:32 UTC (rev 216310)
+++ releases/WebKitGTK/webkit-2.16/ChangeLog 2017-05-06 08:08:39 UTC (rev 216311)
@@ -1,3 +1,14 @@
+2017-04-06 Nael Ouedraogo <nael.ouedra...@crf.canon.fr>
+
+ [GTK] Build fails when using icecream, ccache and cmake 3.6
+ https://bugs.webkit.org/show_bug.cgi?id=170498
+
+ Reviewed by Michael Catanzaro.
+
+ Disable ninja response file when using icecream, ccache and cmake > 3.5.
+
+ * Source/cmake/OptionsCommon.cmake:
+
2017-04-04 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.16.1 release.
Modified: releases/WebKitGTK/webkit-2.16/Source/cmake/OptionsCommon.cmake (216310 => 216311)
--- releases/WebKitGTK/webkit-2.16/Source/cmake/OptionsCommon.cmake 2017-05-06 08:08:32 UTC (rev 216310)
+++ releases/WebKitGTK/webkit-2.16/Source/cmake/OptionsCommon.cmake 2017-05-06 08:08:39 UTC (rev 216311)
@@ -215,8 +215,8 @@
if (NOT APPLE)
# If using Ninja with cmake >= 3.6.0 and icecream, then the build is broken
# if enable the response files. See https://bugs.webkit.org/show_bug.cgi?id=168770
- if (NOT ((${CMAKE_CXX_COMPILER} MATCHES ".*icecc.*") AND (CMAKE_GENERATOR STREQUAL "Ninja") AND (${CMAKE_VERSION} VERSION_GREATER 3.5)))
- set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
+ if (NOT ((((${CMAKE_CXX_COMPILER} MATCHES ".*ccache.*") AND ($ENV{CCACHE_PREFIX} MATCHES ".*icecc.*")) OR (${CMAKE_CXX_COMPILER} MATCHES ".*icecc.*")) AND (CMAKE_GENERATOR STREQUAL "Ninja") AND (${CMAKE_VERSION} VERSION_GREATER 3.5)))
+ set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1)
endif ()
endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
