Revert "Make -std=c++11 nvcc flag consistent for in-build and install…

…ed versions" This reverts commit 11e29e0.
STEllAR-GROUP · Feb 13, 2017 · 3b6adff · 3b6adff
1 parent 7a33b4a
commit 3b6adff
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -975,7 +975,6 @@ if(HPX_WITH_CUDA AND NOT HPX_WITH_CUDA_CLANG)
     set(CUDA_NVCC_FLAGS_RELEASE ${CUDA_NVCC_FLAGS_RELEASE};-DNDEBUG;-O2;-Xcompiler=-MD,-Ox;-Xcompiler=-bigobj)
   endif()
   set(CUDA_SEPARABLE_COMPILATION ON)
-  set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};${CXX_FLAG})
   set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-gencode=arch=compute_30,code=sm_30)
   set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-gencode=arch=compute_35,code=sm_35)
   set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-gencode=arch=compute_30,code=compute_30)

diff --git a/cmake/templates/HPXConfig.cmake.in b/cmake/templates/HPXConfig.cmake.in
@@ -75,6 +75,6 @@ set(HPX_WITH_CUDA_CLANG @HPX_WITH_CUDA_CLANG@)
 if(HPX_WITH_CUDA AND NOT HPX_WITH_CUDA_CLANG)
     find_package(CUDA REQUIRED)
     set(CUDA_SEPARABLE_COMPILATION ON)
-    set(CUDA_NVCC_FLAGS @CUDA_NVCC_FLAGS@)
+    set(CUDA_NVCC_FLAGS @CXX_FLAG@ @CUDA_NVCC_FLAGS@)
     cuda_include_directories("@HPX_CMAKE_CONF_INCLUDE_DIRS@")
 endif()