Try fixing processor detection with MSVC

This commit is contained in:
Jean Pierre Cimalando 2020-03-06 20:27:06 +01:00 committed by Paul Fd
parent 8fdfc98cc9
commit 0bb1a34f55

View file

@ -3,24 +3,34 @@ set (VSTPLUGIN_VENDOR "Paul Ferrand")
set (VSTPLUGIN_URL "http://sfztools.github.io/sfizz")
set (VSTPLUGIN_EMAIL "paul@ferrand.cc")
# The variable CMAKE_SYSTEM_PROCESSOR is incorrect on Visual studio...
# see https://gitlab.kitware.com/cmake/cmake/issues/15170
if(MSVC)
set(VST3_SYSTEM_PROCESSOR "${MSVC_CXX_ARCHITECTURE_ID}")
else()
set(VST3_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
endif()
message(STATUS "The system architecture is: ${VST3_SYSTEM_PROCESSOR}")
# --- VST3 Bundle architecture ---
if(NOT VST3_PACKAGE_ARCHITECTURE)
if(APPLE)
# VST3 packages are universal on Apple, architecture string not needed
else()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|amd64|AMD64)$")
if(VST3_SYSTEM_PROCESSOR MATCHES "^(x86_64|amd64|AMD64)$")
set(VST3_PACKAGE_ARCHITECTURE "x86_64")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86)$")
elseif(VST3_SYSTEM_PROCESSOR MATCHES "^(i.86|x86)$")
if(WIN32)
set(VST3_PACKAGE_ARCHITECTURE "x86")
else()
set(VST3_PACKAGE_ARCHITECTURE "i386")
endif()
else()
message(FATAL_ERROR "We don't know this architecture for VST3: ${CMAKE_SYSTEM_PROCESSOR}.")
message(FATAL_ERROR "We don't know this architecture for VST3: ${VST3_SYSTEM_PROCESSOR}.")
endif()
endif()
endif()
message(STATUS "The system architecture is: ${CMAKE_SYSTEM_PROCESSOR}")
message(STATUS "The VST3 architecture is deduced as: ${VST3_PACKAGE_ARCHITECTURE}")