From 8ce71cafad5353b21dcc8c309a15b205d6989f48 Mon Sep 17 00:00:00 2001
From: Jean Pierre Cimalando <jp-dev@inbox.ru>
Date: Thu, 2 Apr 2020 16:53:55 +0200
Subject: [PATCH] Attempt to fix MOD devices

---
 .travis/script_moddevices.sh |  4 +++-
 cmake/SfizzConfig.cmake      | 10 ++++++----
 cmake/VSTConfig.cmake        |  9 ++-------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.travis/script_moddevices.sh b/.travis/script_moddevices.sh
index 7b074e15..d36b982c 100755
--- a/.travis/script_moddevices.sh
+++ b/.travis/script_moddevices.sh
@@ -5,5 +5,7 @@ set -ex
 
 mkdir -p build/${INSTALL_DIR} && cd build
 
-buildenv mod-plugin-builder /usr/local/bin/cmake -DCMAKE_BUILD_TYPE=Release -DSFIZZ_JACK=OFF ..
+buildenv mod-plugin-builder /usr/local/bin/cmake \
+         -DSFIZZ_SYSTEM_PROCESSOR=armv7-a \
+         -DCMAKE_BUILD_TYPE=Release -DSFIZZ_JACK=OFF ..
 buildenv mod-plugin-builder make -j
diff --git a/cmake/SfizzConfig.cmake b/cmake/SfizzConfig.cmake
index ccd52103..bbf9f43e 100644
--- a/cmake/SfizzConfig.cmake
+++ b/cmake/SfizzConfig.cmake
@@ -18,10 +18,12 @@ endif()
 # The variable CMAKE_SYSTEM_PROCESSOR is incorrect on Visual studio...
 # see https://gitlab.kitware.com/cmake/cmake/issues/15170
 
-if(MSVC)
-    set(SFIZZ_SYSTEM_PROCESSOR "${MSVC_CXX_ARCHITECTURE_ID}")
-else()
-    set(SFIZZ_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+if (NOT SFIZZ_SYSTEM_PROCESSOR)
+    if(MSVC)
+        set(SFIZZ_SYSTEM_PROCESSOR "${MSVC_CXX_ARCHITECTURE_ID}")
+    else()
+        set(SFIZZ_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+    endif()
 endif()
 
 # Add required flags for the builds
diff --git a/cmake/VSTConfig.cmake b/cmake/VSTConfig.cmake
index afa29779..02ec9137 100644
--- a/cmake/VSTConfig.cmake
+++ b/cmake/VSTConfig.cmake
@@ -11,13 +11,8 @@ else()
     "Install destination for VST bundle [default: ${CMAKE_INSTALL_PREFIX}/lib/vst3}]")
 endif()
 
-# 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}")
+if (NOT VST3_SYSTEM_PROCESSOR)
+    set(VST3_SYSTEM_PROCESSOR "${SFIZZ_SYSTEM_PROCESSOR}")
 endif()
 
 message(STATUS "The system architecture is: ${VST3_SYSTEM_PROCESSOR}")