diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-12 19:21:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-12-12 19:21:33 (GMT) |
| commit | 3d3d3f94703e23d3d2cbff67537057474e3e0ff1 (patch) | |
| tree | 476a1ababf129de957a0b58b2a683d632994594b | |
| parent | 7b47ce5a3a9bf9b92c4f8f2590b788da444a6f94 (diff) | |
| parent | c1a55079177c256c83ba5ab4bd72555537ba69bf (diff) | |
| download | CMake-3d3d3f94703e23d3d2cbff67537057474e3e0ff1.zip CMake-3d3d3f94703e23d3d2cbff67537057474e3e0ff1.tar.gz CMake-3d3d3f94703e23d3d2cbff67537057474e3e0ff1.tar.bz2 | |
Merge topic 'cuda-fixups'
c1a55079 CUDA: Fix Cuda.Complex test case extern function signatures
7552d16d CUDA: Fix default compiler flag initialization
| -rw-r--r-- | Modules/Compiler/NVIDIA-CUDA.cmake | 10 | ||||
| -rw-r--r-- | Tests/Cuda/Complex/main.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake index e3ff5e3..605d555 100644 --- a/Modules/Compiler/NVIDIA-CUDA.cmake +++ b/Modules/Compiler/NVIDIA-CUDA.cmake @@ -10,11 +10,11 @@ set(CMAKE_SHARED_LIBRARY_CREATE_CUDA_FLAGS -shared) set(CMAKE_INCLUDE_SYSTEM_FLAG_CUDA -isystem=) set(CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITY -Xcompiler=-fvisibility=) -set(CMAKE_CUDA_FLAGS_INIT " ") -set(CMAKE_CUDA_FLAGS_DEBUG_INIT " -g") -set(CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG") -set(CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG") -set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") +string(APPEND CMAKE_CUDA_FLAGS_INIT " ") +string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g") +string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG") +string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG") +string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG") set(CMAKE_CUDA98_STANDARD_COMPILE_OPTION "") set(CMAKE_CUDA98_EXTENSION_COMPILE_OPTION "") diff --git a/Tests/Cuda/Complex/main.cpp b/Tests/Cuda/Complex/main.cpp index a72ffd7..32312d0 100644 --- a/Tests/Cuda/Complex/main.cpp +++ b/Tests/Cuda/Complex/main.cpp @@ -3,8 +3,8 @@ #include "file1.h" #include "file2.h" -result_type call_cuda_seperable_code(int x); -result_type mixed_launch_kernel(int x); +int call_cuda_seperable_code(int x); +int mixed_launch_kernel(int x); int main(int argc, char** argv) { |