CMake: Make sure the cuda wrapper only uses -std=c++11

diff --git a/cmake/configure/configure_1_cuda.cmake b/cmake/configure/configure_1_cuda.cmake
index aec9028c97d44ba179d59db0f420cc5fed314d58..98bc5239380736ba08a320d00920e5f7e6eb5d59 100644 (file)
--- a/cmake/configure/configure_1_cuda.cmake
+++ b/cmake/configure/configure_1_cuda.cmake
@@ -17,13 +17,17 @@
 # Configuration for cuda support:
 #
 
+#
+# cuda support is experimental. Therefore, disable the feature per default:
+#
+SET(DEAL_II_WITH_CUDA FALSE CACHE BOOL "")
+
 #
 # FindCUDA needs a compiler set up with C++11 support. Thus, only configure
 # if deal.II was configured with C++11 support.
 #
 SET(FEATURE_CUDA_DEPENDS CXX11)
 
-SET(DEAL_II_WITH_CUDA FALSE CACHE BOOL "")
 
 MACRO(FEATURE_CUDA_FIND_EXTERNAL var)
 

diff --git a/cmake/macros/macro_deal_ii_add_library.cmake b/cmake/macros/macro_deal_ii_add_library.cmake
index 5a4c900cdf1e925d9b0669771667db00d1020ff0..3e4a9bf44dc98874aaa5a5954ec2c8d2b19fee1d 100644 (file)
--- a/cmake/macros/macro_deal_ii_add_library.cmake
+++ b/cmake/macros/macro_deal_ii_add_library.cmake
@@ -67,7 +67,9 @@ MACRO(DEAL_II_ADD_LIBRARY _library)
       # CUDA_WRAP_SRCS does not automatically pick up host compiler flags
       # from the target, so we have to feed relevant flags ourselves
       #
-      SET(CMAKE_CXX_FLAGS
+      # Furthermore, C++14 is not yet supported, so filter the flag:
+      #
+      STRING(REPLACE "-std=c++14" "-std=c++11" CMAKE_CXX_FLAGS
         "${DEAL_II_CXX_FLAGS} ${DEAL_II_CXX_FLAGS_${_build}}"
         )