Merge topic 'cuda-fixups'

c1a55079 CUDA: Fix Cuda.Complex test case extern function signatures
7552d16d CUDA: Fix default compiler flag initialization

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 "")

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)
 {