From cb798beb567d4567dfc1723ef6a73a4ccf50c6b8 Mon Sep 17 00:00:00 2001 From: Pierre Moreau Date: Tue, 30 Apr 2019 16:24:51 +0200 Subject: [PATCH] cl12: Do not mistake x86_64 platforms as x86 (#229) --- test_conformance/conversions/CMakeLists.txt | 2 +- test_conformance/integer_ops/CMakeLists.txt | 2 +- test_conformance/math_brute_force/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt index ad5076aa..b3a50e6f 100644 --- a/test_conformance/conversions/CMakeLists.txt +++ b/test_conformance/conversions/CMakeLists.txt @@ -29,7 +29,7 @@ set_source_files_properties( ../../test_common/harness/errorHelpers.c PROPERTIES LANGUAGE CXX) -if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86$)|(X86$)") if(NOT CMAKE_CL_64 AND NOT MSVC AND NOT ANDROID) # -march is needed for CPU atomics, default arch on gcc is i386 # that does not support atomics. diff --git a/test_conformance/integer_ops/CMakeLists.txt b/test_conformance/integer_ops/CMakeLists.txt index 8e06ed5d..2a64901a 100644 --- a/test_conformance/integer_ops/CMakeLists.txt +++ b/test_conformance/integer_ops/CMakeLists.txt @@ -41,7 +41,7 @@ set_source_files_properties( PROPERTIES LANGUAGE CXX) if (NOT CMAKE_CL_64 AND NOT MSVC) -if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)" AND NOT MSVC) +if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86$)|(X86$)" AND NOT MSVC) set_source_files_properties( main.c test_popcount.c diff --git a/test_conformance/math_brute_force/CMakeLists.txt b/test_conformance/math_brute_force/CMakeLists.txt index 0e3e86f9..58787e2a 100644 --- a/test_conformance/math_brute_force/CMakeLists.txt +++ b/test_conformance/math_brute_force/CMakeLists.txt @@ -50,7 +50,7 @@ set_source_files_properties( endif(MSVC) if (NOT CMAKE_CL_64 AND NOT MSVC) -if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)" AND NOT MSVC) +if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86$)|(X86$)" AND NOT MSVC) set_source_files_properties( FunctionList.c Sleep.c