diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-08 15:16:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-12-08 15:17:33 (GMT) |
| commit | d00d5ac0cdf14c9622c1db01e37958dc075bd67e (patch) | |
| tree | c3114477e7795b309428e08b5cbe5d26d36e00a4 /Tests | |
| parent | 6aa3c3206e3c38d94e5c25f2d8fa726163944d01 (diff) | |
| parent | 9af93fef11e9ea23d7d87a1c217254c482555262 (diff) | |
| download | CMake-d00d5ac0cdf14c9622c1db01e37958dc075bd67e.zip CMake-d00d5ac0cdf14c9622c1db01e37958dc075bd67e.tar.gz CMake-d00d5ac0cdf14c9622c1db01e37958dc075bd67e.tar.bz2 | |
Merge topic 'correct_ispc_path_computation' into release-3.19
9af93fef11 ISPC: Handle OBJECT sources in different directories
72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5581
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/ISPC/ObjectLibrary/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ISPC/ObjectLibrary/subdir/extra.ispc (renamed from Tests/ISPC/ObjectLibrary/extra.ispc) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Tests/ISPC/ObjectLibrary/CMakeLists.txt b/Tests/ISPC/ObjectLibrary/CMakeLists.txt index 4767d7e..a4c81a9 100644 --- a/Tests/ISPC/ObjectLibrary/CMakeLists.txt +++ b/Tests/ISPC/ObjectLibrary/CMakeLists.txt @@ -8,7 +8,7 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 4) endif() -add_library(ispc_objects OBJECT simple.ispc extra.ispc) +add_library(ispc_objects OBJECT simple.ispc subdir/extra.ispc) set_target_properties(ispc_objects PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(ispc_objects PROPERTIES ISPC_INSTRUCTION_SETS "sse2-i32x4;sse4-i8x16") diff --git a/Tests/ISPC/ObjectLibrary/extra.ispc b/Tests/ISPC/ObjectLibrary/subdir/extra.ispc index 5a4a442..5a4a442 100644 --- a/Tests/ISPC/ObjectLibrary/extra.ispc +++ b/Tests/ISPC/ObjectLibrary/subdir/extra.ispc |