Resolve merge conflicts.

This commit is contained in:
John Ralls
2021-11-12 16:09:00 -08:00
94 changed files with 14363 additions and 12838 deletions

View File

@@ -569,7 +569,7 @@ endif()
add_definitions(-D_GNU_SOURCE)
# Also, set the C++ version to c++11
# Set up the language standards:
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)