Title: [154978] trunk
- Revision
- 154978
- Author
- par...@webkit.org
- Date
- 2013-09-03 06:25:14 -0700 (Tue, 03 Sep 2013)
Log Message
[CMake] Fix detection of x86_64 platform with MSVC
https://bugs.webkit.org/show_bug.cgi?id=116662
Reviewed by Gyuyoung Kim.
Use ${MSVC_CXX_ARCHITECTURE_ID} instead of ${CMAKE_SYSTEM_PROCESSOR}, since
the later one just resolves to the host processor on Windows.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (154977 => 154978)
--- trunk/CMakeLists.txt 2013-09-03 13:16:54 UTC (rev 154977)
+++ trunk/CMakeLists.txt 2013-09-03 13:25:14 UTC (rev 154978)
@@ -67,17 +67,23 @@
# -----------------------------------------------------------------------------
# Determine the target processor
# -----------------------------------------------------------------------------
-string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
+# Use MSVC_CXX_ARCHITECTURE_ID instead of CMAKE_SYSTEM_PROCESSOR when defined,
+# since the later one just resolves to the host processor on Windows.
+if (MSVC_CXX_ARCHITECTURE_ID)
+ string(TOLOWER ${MSVC_CXX_ARCHITECTURE_ID} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
+else ()
+ string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} LOWERCASE_CMAKE_SYSTEM_PROCESSOR)
+endif ()
if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
set(WTF_CPU_ARM 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
set(WTF_CPU_MIPS 1)
-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64)")
+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
set(WTF_CPU_X86_64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
set(WTF_CPU_X86 1)
else ()
- message(FATAL_ERROR "Unknown CPU '${CMAKE_SYSTEM_PROCESSOR}'")
+ message(FATAL_ERROR "Unknown CPU '${LOWERCASE_CMAKE_SYSTEM_PROCESSOR}'")
endif ()
# -----------------------------------------------------------------------------
Modified: trunk/ChangeLog (154977 => 154978)
--- trunk/ChangeLog 2013-09-03 13:16:54 UTC (rev 154977)
+++ trunk/ChangeLog 2013-09-03 13:25:14 UTC (rev 154978)
@@ -1,3 +1,15 @@
+2013-09-03 Patrick Gansterer <par...@webkit.org>
+
+ [CMake] Fix detection of x86_64 platform with MSVC
+ https://bugs.webkit.org/show_bug.cgi?id=116662
+
+ Reviewed by Gyuyoung Kim.
+
+ Use ${MSVC_CXX_ARCHITECTURE_ID} instead of ${CMAKE_SYSTEM_PROCESSOR}, since
+ the later one just resolves to the host processor on Windows.
+
+ * CMakeLists.txt:
+
2013-08-29 Sam Weinig <s...@webkit.org>
Add ENABLE guards for Promises
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
