Changeset 218430 in webkit

Timestamp:

Jun 16, 2017, 5:20:54 PM (8 years ago)

Author:

achristensen@apple.com

Message:

Fix Visual Studio 2017 64-bit build after r218258
​https://bugs.webkit.org/show_bug.cgi?id=173308

• PlatformWin.cmake:

We still need the enable_language(ASM_MASM) even if we explicitly call ml64 with VS2017.
Otherwise CMake complains about a missing variable CMAKE_ASM_MASM_COMPILE_OBJECT.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• PlatformWin.cmake (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-06-16  Alex Christensen  <achristensen@webkit.org>
+
+        Fix Visual Studio 2017 64-bit build after r218258
+        https://bugs.webkit.org/show_bug.cgi?id=173308
+
+        * PlatformWin.cmake:
+        We still need the enable_language(ASM_MASM) even if we explicitly call ml64 with VS2017.
+        Otherwise CMake complains about a missing variable CMAKE_ASM_MASM_COMPILE_OBJECT.
+
 2017-06-14  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebKit/PlatformWin.cmake

@@ -255 +255 @@
 
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    enable_language(ASM_MASM)
     if (MSVC)
         set(MASM_EXECUTABLE ml64)
@@ -269 +270 @@
         )
     else ()
-        enable_language(ASM_MASM)
         list(APPEND WebKit_SOURCES
             win/plugins/PaintHooks.asm