From e1d5391f224f0f156723b9a160a77745cac0d1f3 Mon Sep 17 00:00:00 2001 From: Dominic Clark Date: Sun, 3 Oct 2021 23:45:13 +0100 Subject: [PATCH] Fix MSVC architecture detection with non-VS generators (#6175) --- cmake/modules/DetectMachine.cmake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmake/modules/DetectMachine.cmake b/cmake/modules/DetectMachine.cmake index e3daa99f3..32903d772 100644 --- a/cmake/modules/DetectMachine.cmake +++ b/cmake/modules/DetectMachine.cmake @@ -50,6 +50,15 @@ IF(WIN32) SET(IS_ARM64 TRUE) ELSEIF(MSVC_TARGET_PLATFORM MATCHES "arm") SET(IS_ARM32 TRUE) + ELSEIF(CMAKE_CXX_COMPILER MATCHES "amd64/cl.exe$" OR CMAKE_CXX_COMPILER MATCHES "x64/cl.exe$") + SET(IS_X86_64 TRUE) + SET(LMMS_BUILD_WIN64 TRUE) + ELSEIF(CMAKE_CXX_COMPILER MATCHES "bin/cl.exe$" OR CMAKE_CXX_COMPILER MATCHES "x86/cl.exe$") + SET(IS_X86 TRUE) + ELSEIF(CMAKE_CXX_COMPILER MATCHES "arm64/cl.exe$") + SET(IS_ARM64 TRUE) + ELSEIF(CMAKE_CXX_COMPILER MATCHES "arm/cl.exe$") + SET(IS_ARM32 TRUE) ELSE() MESSAGE(WARNING "Unknown target architecture: ${MSVC_TARGET_PLATFORM}") ENDIF()