[ci] Fixes for raspberry pi

ossia · Aug 4, 2023 · e97efea · e97efea
1 parent d4e0c13
commit e97efea
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/3rdparty/libossia b/3rdparty/libossia
diff --git a/3rdparty/libossia.cmake b/3rdparty/libossia.cmake
@@ -43,15 +43,29 @@ if(SCORE_DEPLOYMENT_BUILD)
     set(KFR_ENABLE_DFT_MULTIARCH 0)
     set(KFR_ENABLE_DFT_MULTIARCH 0 CACHE "" INTERNAL)
   else()
-    set(KFR_ENABLE_DFT_MULTIARCH 1)
-    set(KFR_ENABLE_DFT_MULTIARCH 1 CACHE "" INTERNAL)
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES x86)
+      set(KFR_ENABLE_DFT_MULTIARCH 1)
+      set(KFR_ENABLE_DFT_MULTIARCH 1 CACHE "" INTERNAL)
+    else()
+      set(KFR_ENABLE_DFT_MULTIARCH 0)
+      set(KFR_ENABLE_DFT_MULTIARCH 0 CACHE "" INTERNAL)
+    endif()
   endif()
 endif()
 
 if(OSSIA_ENABLE_KFR)
     if(NOT CPU_ARCH AND NOT KFR_ARCH)
-        set(KFR_ARCH sse2)
-        set(KFR_ARCH sse2 CACHE "" INTERNAL)
+      if(APPLE)
+        if(CMAKE_SYSTEM_PROCESSOR MATCHES x86)
+          set(KFR_ARCH avx)
+          set(KFR_ARCH avx CACHE "" INTERNAL)
+        endif()
+      else()
+        if(CMAKE_SYSTEM_PROCESSOR MATCHES x86)
+          set(KFR_ARCH sse2)
+          set(KFR_ARCH sse2 CACHE "" INTERNAL)
+        endif()
+      endif()
     endif()
 endif()
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -163,9 +163,6 @@ include_directories(SYSTEM "${OSSIA_3RDPARTY_FOLDER}/readerwriterqueue")
 
 include_directories(SYSTEM "${3RDPARTY_FOLDER}/magicitems/include/")
 include_directories(SYSTEM "${3RDPARTY_FOLDER}/avendish/include/")
-if(BOOST_ROOT)
-  include_directories(SYSTEM "${BOOST_ROOT}")
-endif()
 
 set(SCORE_LIBRARIES_LIST CACHE INTERNAL "List of libraries")
 set(SCORE_PLUGINS_LIST CACHE INTERNAL "List of plugins")