Changeset 215001 in webkit

Timestamp:

Apr 6, 2017 1:24:30 AM (7 years ago)

Author:

nael.ouedraogo@crf.canon.fr

Message:

[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:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2017-04-06  Nael Ouedraogo  <nael.ouedraogo@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  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/cmake/OptionsCommon.cmake

@@ -216 +216 @@
    # 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 ()