diff options
author | Brad King <brad.king@kitware.com> | 2020-09-11 12:30:43 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-11 12:31:13 (GMT) |
commit | 907a3de1c4c059410f7f479be1217126f5924869 (patch) | |
tree | b9047eda597bd98693d96efee60c67af555e563a /Modules | |
parent | ed7323b66cc8d612f25cec18680dd9585d6c739f (diff) | |
parent | bf88a94d88556ecd93e5612afe3fad99334579fb (diff) | |
download | CMake-907a3de1c4c059410f7f479be1217126f5924869.zip CMake-907a3de1c4c059410f7f479be1217126f5924869.tar.gz CMake-907a3de1c4c059410f7f479be1217126f5924869.tar.bz2 |
Merge topic 'ispc_window_failures'
bf88a94d88 ISPC: CompilerLauncher tests work properly with x86 builds
8de145cae1 ISPC: DynamicLibrary test now passes on windows.
a83521e082 ISPC: Use the `obj` file extension for objects on windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5213
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/CMakeISPCInformation.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/CMakeISPCInformation.cmake b/Modules/CMakeISPCInformation.cmake index 46bda5b..5acb682 100644 --- a/Modules/CMakeISPCInformation.cmake +++ b/Modules/CMakeISPCInformation.cmake @@ -1,7 +1,11 @@ # Distributed under the OSI-approved BSD 3-Clause License. See accompanying # file Copyright.txt or https://cmake.org/licensing for details. -set(CMAKE_ISPC_OUTPUT_EXTENSION .o) +if(UNIX) + set(CMAKE_ISPC_OUTPUT_EXTENSION .o) +else() + set(CMAKE_ISPC_OUTPUT_EXTENSION .obj) +endif() set(CMAKE_INCLUDE_FLAG_ISPC "-I") # Load compiler-specific information. |