songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CONFIG: update c++ standard to c++17.

Browse Source
This commit is contained in:
mattijs 2024-12-12 11:55:52 +00:00
parent 59c74e53ff
commit 44f7a7268a
12 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wmake/rules/General/Clang/c++
View File

@ -3,7 +3,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
SUFFIXES += .C .cc .cpp .cxx SUFFIXES += .C .cc .cpp .cxx
CC := clang++$(COMPILER_VERSION) -std=c++14 CC := clang++$(COMPILER_VERSION) -std=c++17
c++ARCH := c++ARCH :=
c++DBUG := c++DBUG :=

2
wmake/rules/General/Gcc/c++
View File

@ -6,7 +6,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
SUFFIXES += .C .cc .cpp .cxx SUFFIXES += .C .cc .cpp .cxx
CC := g++$(COMPILER_VERSION) -std=c++14 CC := g++$(COMPILER_VERSION) -std=c++17
c++ARCH := c++ARCH :=
c++DBUG := c++DBUG :=

2
wmake/rules/General/Icc/c++
View File

@ -3,7 +3,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
SUFFIXES += .C .cc .cpp .cxx SUFFIXES += .C .cc .cpp .cxx
CC := icpc$(COMPILER_VERSION) -std=c++14 CC := icpc$(COMPILER_VERSION) -std=c++17
c++ARCH := c++ARCH :=
c++DBUG := c++DBUG :=

2
wmake/rules/General/Icx/c++
View File

@ -3,7 +3,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
SUFFIXES += .C .cc .cpp .cxx SUFFIXES += .C .cc .cpp .cxx
CC := icpx$(COMPILER_VERSION) -std=c++14 CC := icpx$(COMPILER_VERSION) -std=c++17
c++ARCH := c++ARCH :=
c++DBUG := c++DBUG :=

2
wmake/rules/General/Nvidia/c++
View File

@ -3,7 +3,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
SUFFIXES += .C .cc .cpp .cxx SUFFIXES += .C .cc .cpp .cxx
CC := nvc++$(COMPILER_VERSION) -std=c++14 CC := nvc++$(COMPILER_VERSION) -std=c++17
c++ARCH := c++ARCH :=
c++DBUG := c++DBUG :=

2
wmake/rules/General/cuda
View File

@ -7,7 +7,7 @@ ifeq (,$(strip $(NVARCH)))
NVARCH = 70 NVARCH = 70
endif endif
NVCC = nvcc -std=c++14 --compiler-options='-fPIC' NVCC = nvcc -std=c++17 --compiler-options='-fPIC'
cuARCH = -arch=sm_$(NVARCH) cuARCH = -arch=sm_$(NVARCH)
cuOPT = -O3 cuOPT = -O3

2
wmake/rules/darwin64Clang/c++
View File

@ -2,7 +2,7 @@
include $(GENERAL_RULES)/Clang/c++ include $(GENERAL_RULES)/Clang/c++
ifneq (,$(findstring +xcrun,$(WM_COMPILE_CONTROL))) ifneq (,$(findstring +xcrun,$(WM_COMPILE_CONTROL)))
CC := xcrun c++ -std=c++14 CC := xcrun c++ -std=c++17
endif endif
c++ARCH := -m64 -pthread -ftrapping-math c++ARCH := -m64 -pthread -ftrapping-math

2
wmake/rules/linux64Clang/c++Scan
View File

@ -5,6 +5,6 @@
sinclude $(GENERAL_RULES)/common/c++Opt sinclude $(GENERAL_RULES)/common/c++Opt
cxx_compiler := $(shell which clang++) cxx_compiler := $(shell which clang++)
CC := $(shell echo "$(cxx_compiler)" | sed -e 's@/bin/[^/]*@/libexec/c++-analyzer@') -std=c++14 -m64 CC := $(shell echo "$(cxx_compiler)" | sed -e 's@/bin/[^/]*@/libexec/c++-analyzer@') -std=c++17 -m64
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

4
wmake/rules/linux64Cray/c++
View File

@ -1,9 +1,9 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Cray compiler - gcc variant/wrapper. New enough to support c++14 # Cray compiler - gcc variant/wrapper. New enough to support c++17
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
include $(GENERAL_RULES)/Gcc/c++ include $(GENERAL_RULES)/Gcc/c++
CC := CC -std=c++14 CC := CC -std=c++17
c++ARCH := -m64 -pthread c++ARCH := -m64 -pthread
ifneq (,$(strip $(WM_COMPILE_OPTION))) ifneq (,$(strip $(WM_COMPILE_OPTION)))

6
wmake/rules/linux64Mingw/c++
View File

@ -1,10 +1,10 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# mingw is gcc, but new enough to support c++14 # mingw is gcc, but new enough to support c++17
# NB: gnu++14 (not c++14) to ensure __STRICT_ANSI__ is not defined # NB: gnu++17 (not c++17) to ensure __STRICT_ANSI__ is not defined
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
include $(GENERAL_RULES)/Gcc/c++ include $(GENERAL_RULES)/Gcc/c++
CC := x86_64-w64-mingw32-g++ -std=gnu++14 CC := x86_64-w64-mingw32-g++ -std=gnu++17
c++ARCH := -m64 -pthread c++ARCH := -m64 -pthread
ifneq (,$(strip $(WM_COMPILE_OPTION))) ifneq (,$(strip $(WM_COMPILE_OPTION)))

2
wmake/rules/linuxARM64Arm/c++
View File

@ -3,7 +3,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
include $(GENERAL_RULES)/Clang/c++ include $(GENERAL_RULES)/Clang/c++
CC := armclang++$(COMPILER_VERSION) -std=c++14 CC := armclang++$(COMPILER_VERSION) -std=c++17
c++ARCH := -mcpu=native -pthread c++ARCH := -mcpu=native -pthread
ifneq (,$(strip $(WM_COMPILE_OPTION))) ifneq (,$(strip $(WM_COMPILE_OPTION)))

2
wmake/rules/linuxARM64Fujitsu/c++
View File

@ -3,7 +3,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
include $(GENERAL_RULES)/Clang/c++ include $(GENERAL_RULES)/Clang/c++
CC := FCC$(COMPILER_VERSION) -std=c++14 CC := FCC$(COMPILER_VERSION) -std=c++17
c++ARCH := -pthread c++ARCH := -pthread
ifneq (,$(strip $(WM_COMPILE_OPTION))) ifneq (,$(strip $(WM_COMPILE_OPTION)))