File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -70,8 +70,10 @@ include(CheckLanguage)
7070# Usual initialization stuff
7171#
7272######################################################################
73- set (CMAKE_CXX_STANDARD 11)
74- #set(CMAKE_CXX_STANDARD 14)
73+ if (NOT CMAKE_CXX_STANDARD )
74+ set (CMAKE_CXX_STANDARD 11)
75+ #set(CMAKE_CXX_STANDARD 14)
76+ endif ()
7577set (CMAKE_CXX_STANDARD_REQUIRED ON )
7678
7779#message("!!!! top: cxx_implicit='${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}'")
@@ -521,7 +523,9 @@ if (TPL_ENABLE_COMBBLASLIB) ## want to use CombBLAS
521523
522524 message ("-- Enabled support for COMBBLAS" )
523525 set (COMBBLAS_FOUND TRUE )
524- set (CMAKE_CXX_STANDARD 14) # CombBLAS requires c++14
526+ if (NOT CMAKE_CXX_STANDARD )
527+ set (CMAKE_CXX_STANDARD 14) # CombBLAS requires c++14
528+ endif ()
525529
526530 set (COMBBLAS_LIB ${TPL_COMBBLAS_LIBRARIES} )
527531 # fix up COMBBLAS library names
You can’t perform that action at this time.
0 commit comments