Title: [219228] trunk
Revision
219228
Author
commit-qu...@webkit.org
Date
2017-07-06 18:11:00 -0700 (Thu, 06 Jul 2017)

Log Message

[Win] Build precompiled header successfully with clang-cl
https://bugs.webkit.org/show_bug.cgi?id=174221

Patch by Stephan Szabo <stephan.sz...@sony.com> on 2017-07-06
Reviewed by Alex Christensen.

* Source/cmake/WebKitMacros.cmake:

Modified Paths

Diff

Modified: trunk/ChangeLog (219227 => 219228)


--- trunk/ChangeLog	2017-07-07 00:46:53 UTC (rev 219227)
+++ trunk/ChangeLog	2017-07-07 01:11:00 UTC (rev 219228)
@@ -1,3 +1,12 @@
+2017-07-06  Stephan Szabo  <stephan.sz...@sony.com>
+
+        [Win] Build precompiled header successfully with clang-cl
+        https://bugs.webkit.org/show_bug.cgi?id=174221
+
+        Reviewed by Alex Christensen.
+
+        * Source/cmake/WebKitMacros.cmake:
+
 2017-07-05  Yusuke Suzuki  <utatane....@gmail.com>
 
         Upgrade GCC baseline

Modified: trunk/Source/cmake/WebKitMacros.cmake (219227 => 219228)


--- trunk/Source/cmake/WebKitMacros.cmake	2017-07-07 00:46:53 UTC (rev 219227)
+++ trunk/Source/cmake/WebKitMacros.cmake	2017-07-07 01:11:00 UTC (rev 219228)
@@ -34,9 +34,16 @@
         set(PrecompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${_source}/${PrecompiledBasename}.pch")
         set(_sources ${${_source}})
 
-        set_source_files_properties(${_cpp}
-            PROPERTIES COMPILE_FLAGS "/Yc\"${_header}\" /Fp\"${PrecompiledBinary}\""
-            OBJECT_OUTPUTS "${PrecompiledBinary}")
+        # clang-cl requires /FI with /Yc
+        if (COMPILER_IS_CLANG_CL)
+            set_source_files_properties(${_cpp}
+                PROPERTIES COMPILE_FLAGS "/Yc\"${_header}\" /Fp\"${PrecompiledBinary}\" /FI\"${_header}\""
+                OBJECT_OUTPUTS "${PrecompiledBinary}")
+        else ()
+            set_source_files_properties(${_cpp}
+                PROPERTIES COMPILE_FLAGS "/Yc\"${_header}\" /Fp\"${PrecompiledBinary}\""
+                OBJECT_OUTPUTS "${PrecompiledBinary}")
+        endif ()
         set_source_files_properties(${_sources}
             PROPERTIES COMPILE_FLAGS "/Yu\"${_header}\" /FI\"${_header}\" /Fp\"${PrecompiledBinary}\"")
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to