WIP

Author: serge-sans-paille

test/CMakeLists.txt

@@ -43,11 +43,11 @@ OPTION(CROSS_COMPILE_ARM "cross compile for ARM targets" OFF)
 # Note: to compile on ARM (or cross compile), you may need to add the following:
 # -DTARGET_ARCH="armv8-a -mfpu=neon -mfloat-abi=softfp -target arm-linux-gnueabi"
 set(TARGET_ARCH "native" CACHE STRING "Target architecture arguments")
-string(REGEX MATCH "emulated\\\\<[0-9]+\\\\>" TARGET_EMULATED ${TARGET_ARCH})
+string(REGEX MATCH "emulated\\<[0-9]+\\>" TARGET_EMULATED ${TARGET_ARCH})
 
 if (TARGET_EMULATED)
     message(STATUS "Using emulated target: ${TARGET_EMULATED}")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DXSIMD_DEFAULT_ARCH=${TARGET_ARCH} -DXSIMD_WITH_EMULATED=1")
+    set(EMULATED_COMPILE_FLAGS -DXSIMD_DEFAULT_ARCH=${TARGET_ARCH};-DXSIMD_WITH_EMULATED=1)
     unset(TARGET_ARCH CACHE)
 endif()
 
@@ -234,6 +234,11 @@ endif()
 add_subdirectory(doc)
 add_subdirectory(architectures)
 
+if(EMULATED_COMPILE_FLAGS)
+    message(STATUS ${EMULATED_COMPILE_FLAGS})
+    target_compile_options(test_xsimd PRIVATE ${EMULATED_COMPILE_FLAGS})
+endif()
+
 if(EMSCRIPTEN)
     set_target_properties(test_xsimd PROPERTIES LINK_FLAGS "-s MODULARIZE=1 -s EXPORT_NAME=test_xsimd_wasm -s WASM=1 -s ALLOW_MEMORY_GROWTH=1 -lembind")
     target_compile_options(test_xsimd

test/test_arch.cpp

@@ -10,7 +10,7 @@
  ****************************************************************************/
 
 #include "xsimd/xsimd.hpp"
-#ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
+#if !defined(XSIMD_NO_SUPPORTED_ARCHITECTURE) && !defined(XSIMD_WITH_EMULATED)
 
 #include <numeric>
 #include <type_traits>