Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Commit df59823

Browse files
committed
Fix issues with PGI compiler
1 parent cab134d commit df59823

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CMake/config/CompilerFlagsHelpers.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ foreach(COMPILER_LANGUAGE ${SUPPORTED_COMPILER_LANGUAGE_LIST})
123123

124124
## rest of the world
125125
else()
126-
set(CMAKE_${COMPILER_LANGUAGE}_WARNING_ALL "-Wall")
126+
set(CMAKE_${COMPILER_LANGUAGE}_WARNING_ALL "")
127127
set(CMAKE_${COMPILER_LANGUAGE}_DEBUGINFO_FLAGS "-g")
128128

129129
set(CMAKE_${COMPILER_LANGUAGE}_OPT_NONE "-O0")

extra/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ endforeach()
2424
# Additional mods
2525
string(REPLACE ";" " " CORENRN_OPTMODS "${CORENRN_OPTMECH_MODS}")
2626

27+
# PGI add --c++11;-A option for c++11 flag
28+
string(REPLACE ";" " " CXX11_STANDARD_COMPILE_OPTION "${CMAKE_CXX11_STANDARD_COMPILE_OPTION}")
2729

2830
# Compiler flags depending on BUILD_TYPE shared as BUILD_TYPE_<LANG>_FLAGS
2931
string(TOUPPER "${CMAKE_BUILD_TYPE}" _BUILD_TYPE)

extra/nrnivmodl_core_makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ endif
3636
CC = @CMAKE_C_COMPILER@
3737
CXX = @CMAKE_CXX_COMPILER@
3838
CFLAGS = @BUILD_TYPE_C_FLAGS@ @CMAKE_C_FLAGS@
39-
CXXFLAGS = @BUILD_TYPE_CXX_FLAGS@ @CMAKE_CXX_FLAGS@ @CMAKE_CXX11_STANDARD_COMPILE_OPTION@
39+
CXXFLAGS = @BUILD_TYPE_CXX_FLAGS@ @CMAKE_CXX_FLAGS@ @CXX11_STANDARD_COMPILE_OPTION@
4040

4141
COMPILE = $(CC) $(CFLAGS) @CORENRN_COMPILE_DEFS@ $(INCLUDES)
4242
CXXCOMPILE = $(CXX) $(CXXFLAGS) @CORENRN_COMPILE_DEFS@ $(INCLUDES)

0 commit comments

Comments
 (0)