Skip to content

Commit d2356a4

Browse files
authored
Merge pull request xiaoyeli#191 from balay/balay/cmake-cxx_standard
cmake: let user over-ride CMAKE_CXX_STANDARD option
2 parents ef81643 + 8c69c85 commit d2356a4

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff 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()
7577
set(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

0 commit comments

Comments
 (0)