From 99bc5913662790bccfbdd750c5ac940a9036fd1c Mon Sep 17 00:00:00 2001 From: John Keiser Date: Thu, 10 Sep 2020 12:24:52 -0700 Subject: [PATCH] Don't enable fallback test unless fallback is explicitly selected --- cmake/simdjson-flags.cmake | 2 +- tests/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/simdjson-flags.cmake b/cmake/simdjson-flags.cmake index 021ac0cfd..17d1abd5b 100644 --- a/cmake/simdjson-flags.cmake +++ b/cmake/simdjson-flags.cmake @@ -120,7 +120,7 @@ if(NOT SIMDJSON_IMPLEMENTATION_FALLBACK) target_compile_definitions(simdjson-internal-flags INTERFACE SIMDJSON_IMPLEMENTATION_FALLBACK=0) endif() # e.g. SIMDJSON_IMPLEMENTATION="haswell;westmere;-fallback" -set(SIMDJSON_IMPLEMENTATION "" CACHE STRING "Implementations to include/exclude: semicolon separated list of architectures (haswell/westmere/arm64/fallback). Prepend with - to force an implementation off. (e.g. -DSIMDJSON_IMPLEMENTATION=\"haswell;-fallback\") Defaults to compile-time detection.") +set(SIMDJSON_IMPLEMENTATION "" CACHE STRING "Implementations to include/exclude: semicolon separated list of architectures (haswell/westmere/arm64/fallback). Prepend with - to force an implementation off. (e.g. -DSIMDJSON_IMPLEMENTATION=\"haswell;-fallback\" .) Defaults to compile-time detection.") foreach(implementation ${SIMDJSON_IMPLEMENTATION}) string(TOUPPER ${implementation} implementation_upper) string(SUBSTRING ${implementation_upper} 0 1 first_char) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 224e8941a..7a9fb1e24 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -110,7 +110,7 @@ if (BASH AND (NOT WIN32) AND SIMDJSON_BASH AND (TARGET json2json)) # The scripts # # SIMDJSON_FORCE_IMPLEMENTATION tests: run json2json with SIMDJSON # - if (SIMDJSON_IMPLEMENTATION_FALLBACK) + if (SIMDJSON_IMPLEMENTATION MATCHES "fallback") add_test( NAME simdjson_force_implementation COMMAND