Skip to content
Snippets Groups Projects
Commit 32c43076 authored by Lars Bilke's avatar Lars Bilke
Browse files

[CMake] Fixed Win ninja 64-bit in conan.cmake.

parent 1031e50e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scripts/cmake/conan/conan.cmake
+ 1
− 1
View file @ 32c43076
...@@ -112,7 +112,7 @@ function(conan_cmake_settings result) ...@@ -112,7 +112,7 @@ function(conan_cmake_settings result)
endif() endif()
if(${CMAKE_GENERATOR} STREQUAL "Ninja") if(${CMAKE_GENERATOR} STREQUAL "Ninja")
if($ENV{Platform} STREQUAL "X64") if($ENV{Platform} STREQUAL "X64" OR MSVC_CXX_ARCHITECTURE_ID MATCHES "64")
set(_SETTINGS ${_SETTINGS} -s arch=x86_64) set(_SETTINGS ${_SETTINGS} -s arch=x86_64)
elseif($ENV{Platform} STREQUAL "ARM") elseif($ENV{Platform} STREQUAL "ARM")
message(STATUS "Conan: Using default ARM architecture from MSVC") message(STATUS "Conan: Using default ARM architecture from MSVC")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment