Merge branch 'development' of https://github.com/revbayes/revbayes in…

…to development
revbayes · Jun 12, 2019 · c8bf96e · c8bf96e
2 parents 7440801 + 94dbf04
commit c8bf96e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/projects/cmake/regenerate.sh b/projects/cmake/regenerate.sh
@@ -128,7 +128,12 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -static")
 '  >> "$HERE/CMakeLists.txt"
 else
 echo '
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -msse -msse2 -msse3")
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*|aarch64")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+   add_definitions(-DRB_ARM)
+else()
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -msse -msse2 -msse3")
+endif()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
 '  >> "$HERE/CMakeLists.txt"
 fi

diff --git a/src/core/utils/RbOptions.h b/src/core/utils/RbOptions.h
@@ -15,7 +15,9 @@
 //#define TESTING
 
 /* Feature enabling switches */
+#ifndef RB_ARM
 #define SSE_ENABLED
+#endif
 //#define AVX_ENABLED