Changeset 245707 in webkit

Timestamp:

May 23, 2019 1:15:55 PM (5 years ago)

Author:

stephan.szabo@sony.com

Message:

[Win][CMake] Pass architecture to cmake via -A for both x64 and Win32
​https://bugs.webkit.org/show_bug.cgi?id=198098

Reviewed by Don Olmstead.

With current CMake and Visual Studio 2019, the default
architecture will match the host, so we should make sure
to explicitly mention the architecture we want for 32-bit
builds as well for cases where we are on x64 and not in an
x64_x32 cross-build vcvars environment.

• Scripts/webkitdirs.pm:

(getVisualStudioToolset): Get toolset name for cmake/msbuild
(getMSBuildPlatformArgument): Update to use getVisualStudioToolset
(getCMakeWindowsToolsetArgument): Get -A argument for cmake
based on toolset
(generateBuildSystemFromCMakeProject): Remove explicit -A x64
in 64-bit mode in favor of new getCMakeWindowsToolsetArgument.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-23  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [Win][CMake] Pass architecture to cmake via -A for both x64 and Win32
+        https://bugs.webkit.org/show_bug.cgi?id=198098
+
+        Reviewed by Don Olmstead.
+
+        With current CMake and Visual Studio 2019, the default
+        architecture will match the host, so we should make sure
+        to explicitly mention the architecture we want for 32-bit
+        builds as well for cases where we are on x64 and not in an
+        x64_x32 cross-build vcvars environment.
+
+        * Scripts/webkitdirs.pm:
+        (getVisualStudioToolset): Get toolset name for cmake/msbuild
+        (getMSBuildPlatformArgument): Update to use getVisualStudioToolset
+        (getCMakeWindowsToolsetArgument): Get -A argument for cmake
+        based on toolset
+        (generateBuildSystemFromCMakeProject): Remove explicit -A x64
+        in 64-bit mode in favor of new getCMakeWindowsToolsetArgument.
+
 2019-05-23  Youenn Fablet  <youenn@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1874 +1874 @@
 }
 
-sub getMSBuildPlatformArgument()
+sub getVisualStudioToolset()
 {
     if (isPlayStation()) {
         return "";
     } elsif (isWin64()) {
-        return "/p:Platform=x64";
+        return "x64";
     } else {
-        return "/p:Platform=Win32";
-    }
+        return "Win32";
+    }
+}
+
+sub getMSBuildPlatformArgument()
+{
+    my $toolset = getVisualStudioToolset();
+    if (defined($toolset) && length($toolset)) {
+        return "/p:Platform=$toolset";
+    }
+    return "";
+}
+
+sub getCMakeWindowsToolsetArgument()
+{
+    my $toolset = getVisualStudioToolset();
+    if (defined($toolset) && length($toolset)) {
+        return "-A $toolset";
+    }
+    return "";
 }
 
@@ -2198 +2216 @@
         push @args, "-DUSE_THIN_ARCHIVES=OFF" if isPlayStation();
     } else {
-        if (isAnyWindows() && isWin64()) {
-            push @args, '-A x64';
+        if (isAnyWindows()) {
+            push @args, getCMakeWindowsToolsetArgument();
         }
         if ((isAnyWindows() || isPlayStation()) && defined $ENV{VisualStudioVersion}) {