Skip to content

Commit

Permalink
Merge branch 'main' into aditya/lunar_dem_load
Browse files Browse the repository at this point in the history
  • Loading branch information
scpeters committed Jul 6, 2022
2 parents 9e04191 + a714900 commit de85ea3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 26 deletions.
25 changes: 0 additions & 25 deletions configure.bat

This file was deleted.

3 changes: 2 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ gz_get_libsources_and_unittests(sources gtest_sources)

# Create the library target
gz_create_core_library(
SOURCES ${sources})
SOURCES ${sources}
CXX_STANDARD ${CMAKE_CXX_STANDARD})

if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
set(CXX_FILESYSTEM_LIBRARIES stdc++fs)
Expand Down

0 comments on commit de85ea3

Please sign in to comment.