Changeset 219228 in webkit

Timestamp:

Jul 6, 2017 6:11:00 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

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

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

• Source/cmake/WebKitMacros.cmake:

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2017-07-06  Stephan Szabo  <stephan.szabo@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.tea@gmail.com>
 

trunk/Source/cmake/WebKitMacros.cmake

@@ -35 +35 @@
         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}\"")