File tree Expand file tree Collapse file tree 2 files changed +7
-7
lines changed
Expand file tree Collapse file tree 2 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -65,9 +65,10 @@ if(MSVC AND CMAKE_GENERATOR MATCHES "Ninja")
6565 list (APPEND CUDA_NVCC_FLAGS -Xcompiler ${CCTAG_MVSC_LINKER} )
6666endif ()
6767
68- set (CMAKE_CXX_STANDARD 11)
68+ set (CCTAG_CXX_STANDARD 14)
69+ set (CMAKE_CXX_STANDARD ${CCTAG_CXX_STANDARD} )
6970set (CMAKE_CXX_STANDARD_REQUIRED ON )
70- set (CMAKE_CUDA_STANDARD 11 )
71+ set (CMAKE_CUDA_STANDARD ${CCTAG_CXX_STANDARD} )
7172set (CMAKE_CUDA_STANDARD_REQUIRED ON )
7273
7374
@@ -186,7 +187,7 @@ if(CCTAG_WITH_CUDA)
186187 LIST (APPEND CUDA_NVCC_FLAGS ${ARCH_FLAGS} )
187188
188189 if (NOT MSVC )
189- set (CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} ;-std=c++11 " )
190+ set (CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} ;-std=c++${CCTAG_CXX_STANDARD} " )
190191 endif ()
191192 set (CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} ;--default-stream;per-thread" )
192193
Original file line number Diff line number Diff line change @@ -5,6 +5,9 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
55 include (GNUInstallDirs)
66 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR} /${CMAKE_SYSTEM_NAME} -${CMAKE_SYSTEM_PROCESSOR} " )
77 set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR} /${CMAKE_SYSTEM_NAME} -${CMAKE_SYSTEM_PROCESSOR} " )
8+
9+ set (CMAKE_CXX_STANDARD 14)
10+ set (CMAKE_CXX_STANDARD_REQUIRED ON )
811endif ()
912
1013# if this is used as a stand-alone project we need to tell whether to use PIC
@@ -62,10 +65,6 @@ else()
6265 message (STATUS "TBB already there" )
6366endif ()
6467
65- set (CMAKE_CXX_STANDARD 11)
66- set (CMAKE_CXX_STANDARD_REQUIRED ON )
67-
68-
6968set (CCTagRegression_cpp
7069 ./regression/main.cpp
7170 ./regression/TestLog.cpp
You can’t perform that action at this time.
0 commit comments