Merge branch 'GNUtoMS-vs-12' into release
This commit is contained in:
commit
a8c6b309b1
|
@ -151,6 +151,7 @@ macro(__windows_compiler_gnu_abi lang)
|
|||
find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars32.bat
|
||||
DOC "Visual Studio vcvars32.bat"
|
||||
PATHS
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin"
|
||||
|
@ -160,9 +161,10 @@ macro(__windows_compiler_gnu_abi lang)
|
|||
)
|
||||
set(CMAKE_GNUtoMS_ARCH x86)
|
||||
elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
|
||||
find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvarsamd64.bat
|
||||
find_program(CMAKE_GNUtoMS_VCVARS NAMES vcvars64.bat vcvarsamd64.bat
|
||||
DOC "Visual Studio vcvarsamd64.bat"
|
||||
PATHS
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\Setup\\VC;ProductDir]/bin/amd64"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\11.0\\Setup\\VC;ProductDir]/bin/amd64"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/bin/amd64"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VC;ProductDir]/bin/amd64"
|
||||
|
|
Loading…
Reference in New Issue