From 32c43076f67e5ef50dce78fabb1e85e649dcd438 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 4 Sep 2017 14:56:38 +0200
Subject: [PATCH] [CMake] Fixed Win ninja 64-bit in conan.cmake.
---
scripts/cmake/conan/conan.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/cmake/conan/conan.cmake b/scripts/cmake/conan/conan.cmake
index db774945872..cb55621bc77 100644
--- a/scripts/cmake/conan/conan.cmake
+++ b/scripts/cmake/conan/conan.cmake
@@ -112,7 +112,7 @@ function(conan_cmake_settings result)
endif()
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)
elseif($ENV{Platform} STREQUAL "ARM")
message(STATUS "Conan: Using default ARM architecture from MSVC")
--
GitLab