Skip to content

Commit

Permalink
Updates to C++17
Browse files Browse the repository at this point in the history
  • Loading branch information
kellijohnson-NOAA committed Aug 31, 2024
1 parent dfddfa5 commit 13307d1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ project(FIMS
) # CXX is the language name

# GoogleTest requires at least C++11
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)

include(FetchContent)

Expand Down
4 changes: 2 additions & 2 deletions src/Makevars
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CXX_STD = CXX11
CXX_STD = CXX17
PKG_CXXFLAGS = -DTMB_MODEL -DTMB_EIGEN_DISABLE_WARNINGS -w
CXX17STD = -std=c++11 -w
CXX17STD = -std=c++17 -w

6 changes: 3 additions & 3 deletions src/Makevars.win
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CXX_STD = CXX11
PKG_CXXFLAGS = -DTMB_MODEL -DTMB_EIGEN_DISABLE_WARNINGS
CXX17STD = -std=c++11
CXX_STD = CXX17
PKG_CXXFLAGS = -DTMB_MODEL -DTMB_EIGEN_DISABLE_WARNINGS -fpermissive
CXX17STD = -std=c++17
CXX14FLAGS = Wa, -mbig-obj -O3
CXX17FLAGS = Wa, -mbig-obj -O3

0 comments on commit 13307d1

Please sign in to comment.