diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-08 19:11:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-08 19:11:52 (GMT) |
| commit | b1b345c21a180fac2b9ccecf02f708d00f100590 (patch) | |
| tree | a27045df22ff9a24117a7d2691a60c4a17ebd5d4 | |
| parent | 503d0f80e1ccafa8352145b1a733dd41751dcd7f (diff) | |
| parent | c83711d9bd6f6fdbe534f475727bf80f7e8a8603 (diff) | |
| download | CMake-b1b345c21a180fac2b9ccecf02f708d00f100590.zip CMake-b1b345c21a180fac2b9ccecf02f708d00f100590.tar.gz CMake-b1b345c21a180fac2b9ccecf02f708d00f100590.tar.bz2 | |
Merge topic 'ispc_tests_run_on_older_hw'
c83711d9bd ISPC tests will now run on any hardware that only supports SSE2
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5205
| -rw-r--r-- | Tests/ISPC/ChainedStaticLibraries/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Tests/ISPC/DynamicLibrary/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Tests/ISPC/ChainedStaticLibraries/CMakeLists.txt b/Tests/ISPC/ChainedStaticLibraries/CMakeLists.txt index bf0b57e..9a255a0 100644 --- a/Tests/ISPC/ChainedStaticLibraries/CMakeLists.txt +++ b/Tests/ISPC/ChainedStaticLibraries/CMakeLists.txt @@ -11,10 +11,10 @@ add_library(ispc_objects1 STATIC extra.ispc extra.cxx) add_library(ispc_objects2 STATIC simple.ispc) set_target_properties(ispc_objects1 PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(ispc_objects1 PROPERTIES ISPC_INSTRUCTION_SETS "avx1-i32x16;avx2-i32x4") +set_target_properties(ispc_objects1 PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4;avx1-i32x16;avx2-i32x4") set_target_properties(ispc_objects2 PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(ispc_objects2 PROPERTIES ISPC_INSTRUCTION_SETS "avx1-i32x16") +set_target_properties(ispc_objects2 PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4") target_link_libraries(ispc_objects2 PRIVATE ispc_objects1) diff --git a/Tests/ISPC/DynamicLibrary/CMakeLists.txt b/Tests/ISPC/DynamicLibrary/CMakeLists.txt index 59f875e..cbfbb3e 100644 --- a/Tests/ISPC/DynamicLibrary/CMakeLists.txt +++ b/Tests/ISPC/DynamicLibrary/CMakeLists.txt @@ -11,8 +11,8 @@ add_library(ispc_objects1 STATIC extra.ispc extra.cxx) add_library(ispc_objects2 SHARED simple.ispc) set_target_properties(ispc_objects1 PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(ispc_objects1 PROPERTIES ISPC_INSTRUCTION_SETS "avx1-i32x16;avx2-i32x4") -set_target_properties(ispc_objects2 PROPERTIES ISPC_INSTRUCTION_SETS "avx1-i32x16") +set_target_properties(ispc_objects1 PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4;avx1-i32x16;avx2-i32x4") +set_target_properties(ispc_objects2 PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4") target_link_libraries(ispc_objects2 PRIVATE ispc_objects1) |