[CMake][Win] Use WTF_CPU not MSCV_CXX_ARCHITECTURE_ID when determining lib directories
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 May 2017 17:40:14 +0000 (17:40 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 May 2017 17:40:14 +0000 (17:40 +0000)
https://bugs.webkit.org/show_bug.cgi?id=172570

Patch by Don Olmstead <don.olmstead@am.sony.com> on 2017-05-25
Reviewed by Per Arne Vollan.

* Source/cmake/OptionsWin.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@217434 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/cmake/OptionsWin.cmake

index a1b5830..d2fac74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-05-25  Don Olmstead  <don.olmstead@am.sony.com>
+
+        [CMake][Win] Use WTF_CPU not MSCV_CXX_ARCHITECTURE_ID when determining lib directories
+        https://bugs.webkit.org/show_bug.cgi?id=172570
+
+        Reviewed by Per Arne Vollan.
+
+        * Source/cmake/OptionsWin.cmake:
+
 2017-05-24  Don Olmstead  <don.olmstead@am.sony.com>
 
         [CMake] Consolidate CMake code related to Cairo
index 71729cc..6045af9 100644 (file)
@@ -98,7 +98,7 @@ set(CMAKE_PREFIX_PATH ${WEBKIT_LIBRARIES_DIR})
 set(WEBKIT_LIBRARIES_INCLUDE_DIR "${WEBKIT_LIBRARIES_DIR}/include")
 
 include_directories("${CMAKE_BINARY_DIR}/DerivedSources/ForwardingHeaders" "${CMAKE_BINARY_DIR}/DerivedSources" "${WEBKIT_LIBRARIES_INCLUDE_DIR}")
-if (${MSVC_CXX_ARCHITECTURE_ID} STREQUAL "X86")
+if (${WTF_CPU_X86})
     set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS ON)
     set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
     set(WEBKIT_LIBRARIES_LINK_DIR "${WEBKIT_LIBRARIES_DIR}/lib32")