diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-21 17:44:43 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-21 18:23:46 (GMT) |
| commit | f2059585e6302446707560b123c7b785df5f5859 (patch) | |
| tree | e29520e82e81a0e4fb5ffba8447bcf7edb7cded6 /Tests | |
| parent | ab4c3270ae7062a8f3296055b9f6443b80f3aef2 (diff) | |
| download | CMake-f2059585e6302446707560b123c7b785df5f5859.zip CMake-f2059585e6302446707560b123c7b785df5f5859.tar.gz CMake-f2059585e6302446707560b123c7b785df5f5859.tar.bz2 | |
VS: Fix target_compile_options for CUDA
Fix the VS generator to honor `COMPILE_OPTIONS` for CUDA. The exclusion
added by commit v3.9.0-rc1~431^2~7 (VS: Do not pass CUDA compile options
to C compiler, 2017-03-07) was correct but we need additional logic to
pass the CUDA compile options to the CUDA compiler. Also we should
still pass the CXX or C options to MSVC (ClCompile) when those languages
are enabled even if the link language is CUDA.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CudaOnly/WithDefs/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/CudaOnly/WithDefs/main.notcu | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Tests/CudaOnly/WithDefs/CMakeLists.txt b/Tests/CudaOnly/WithDefs/CMakeLists.txt index 38f2a44..e25f141 100644 --- a/Tests/CudaOnly/WithDefs/CMakeLists.txt +++ b/Tests/CudaOnly/WithDefs/CMakeLists.txt @@ -28,6 +28,7 @@ add_executable(CudaOnlyWithDefs ${main}) target_compile_options(CudaOnlyWithDefs PRIVATE + -Xcompiler=-DHOST_DEFINE $<$<CONFIG:DEBUG>:$<BUILD_INTERFACE:${debug_compile_flags}>> ) diff --git a/Tests/CudaOnly/WithDefs/main.notcu b/Tests/CudaOnly/WithDefs/main.notcu index 80ed3a5..d2eff3f 100644 --- a/Tests/CudaOnly/WithDefs/main.notcu +++ b/Tests/CudaOnly/WithDefs/main.notcu @@ -2,6 +2,10 @@ #include <cuda_runtime.h> #include <iostream> +#ifndef HOST_DEFINE +#error "HOST_DEFINE not defined!" +#endif + #ifndef PACKED_DEFINE #error "PACKED_DEFINE not defined!" #endif |