Skip to content

Commit 637bcd0

Browse files
authored
Merge pull request #137 from lsst/tickets/DM-50434
DM-50434: Enable C++20 support
2 parents a067d4d + 74dc673 commit 637bcd0

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

python/lsst/sconsUtils/state.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -548,22 +548,22 @@ def ClassifyCc(context):
548548
env.Append(LINKFLAGS="--coverage")
549549

550550
#
551-
# Enable C++17 support
551+
# Enable C++20 support
552552
#
553553
if not (env.GetOption("clean") or env.GetOption("help") or env.GetOption("no_exec")):
554554
if not env.GetOption("no_progress"):
555-
log.info("Checking for C++17 support")
555+
log.info("Checking for C++20 support")
556556
conf = env.Configure()
557-
for cpp17Arg in (f"-std={val}" for val in ("c++17",)):
557+
for cpp20Arg in (f"-std={val}" for val in ("c++20",)):
558558
conf.env = env.Clone()
559-
conf.env.Append(CXXFLAGS=cpp17Arg)
559+
conf.env.Append(CXXFLAGS=cpp20Arg)
560560
if conf.CheckCXX():
561-
env.Append(CXXFLAGS=cpp17Arg)
561+
env.Append(CXXFLAGS=cpp20Arg)
562562
if not env.GetOption("no_progress"):
563-
log.info(f"C++17 supported with {cpp17Arg!r}")
563+
log.info(f"C++20 supported with {cpp20Arg!r}")
564564
break
565565
else:
566-
log.fail(f"C++17 extensions could not be enabled for compiler {env.whichCc!r}")
566+
log.fail(f"C++20 extensions could not be enabled for compiler {env.whichCc!r}")
567567
conf.Finish()
568568

569569
#

0 commit comments

Comments
 (0)