From 11e29e0f98dc776fb3d2babc3ebd269974b55a9f Mon Sep 17 00:00:00 2001 From: John Biddiscombe Date: Thu, 19 Jan 2017 07:57:09 +0100 Subject: [PATCH] Make -std=c++11 nvcc flag consistent for in-build and installed versions --- CMakeLists.txt | 1 + cmake/templates/HPXConfig.cmake.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40fdbb867085..60aa2974f7f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -970,6 +970,7 @@ 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 index 7311c6ef4ab6..8268e359492d 100644 --- 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 @CXX_FLAG@ @CUDA_NVCC_FLAGS@) + set(CUDA_NVCC_FLAGS @CUDA_NVCC_FLAGS@) cuda_include_directories("@HPX_CMAKE_CONF_INCLUDE_DIRS@") endif()