Compile in c++20

SGL-UT · Mar 8, 2023 · c35c0e4 · c35c0e4
1 parent b9d7401
commit c35c0e4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/BuildSetup.cmake b/BuildSetup.cmake
@@ -51,7 +51,7 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
     set( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -O2" )
     set( CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS} -O3" )
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror=return-type -Werror=deprecated" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -Werror=deprecated" )
     # Do not optimize for debug builds.  Do the same for RELWITHDEBINFO ?
     set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -O0 -g" )
     set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3" )
@@ -170,12 +170,12 @@ if( DEBUG_VERBOSE )
         message( STATUS "---- ${_variableName} = ${${_variableName}}" )
     endforeach()
 endif()
-        
+
 #----------------------------------------
 # Get CMake vars into C++
 #----------------------------------------
 configure_file( "${PROJECT_SOURCE_DIR}/build_config.h.in" "${PROJECT_BINARY_DIR}/generated/build_config.h" )
-include_directories( "${PROJECT_BINARY_DIR}/generated/" ) 
+include_directories( "${PROJECT_BINARY_DIR}/generated/" )
 install( FILES "${PROJECT_BINARY_DIR}/generated/build_config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" )
 
 #----------------------------------------
@@ -204,14 +204,14 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
         set( CPACK_GENERATOR "DEB;TGZ" )
     else (${LINUX_DISTRO} MATCHES "RedHatEnterpriseServer")
         message( STATUS "Detected a Linux machine")
-        set( CPACK_GENERATOR "DEB;TGZ" )    
+        set( CPACK_GENERATOR "DEB;TGZ" )
     endif()
 elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
     set( CPACK_GENERATOR "NSIS;ZIP" )
     set( CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.md")
 endif()
 
-set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Libraries for the GNSS processing GNSSTk toolkit.") 
+set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Libraries for the GNSS processing GNSSTk toolkit.")
 set( CPACK_PACKAGE_VENDOR "ARL:UT SGL" )
 set( CPACK_PACKAGE_CONTACT "David Barber <dbarber@arlut.utexas.edu>" )
 set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md" )
@@ -220,7 +220,7 @@ set( CPACK_PACKAGE_VERSION_MINOR "${GNSSTK_VERSION_MINOR}" )
 set( CPACK_PACKAGE_VERSION_PATCH "${GNSSTK_VERSION_PATCH}" )
 set( CPACK_INCLUDE_TOPLEVEL_DIRECTORY "OFF" )
 set( CPACK_PACKAGE_INSTALL_DIRECTORY "gnsstk${GNSSTK_VERSION_MAJOR}.${GNSSTK_VERSION_MINOR}.${GNSSTK_VERSION_PATCH}" )
-set( CPACK_TOPLEVEL_TAG "gnsstk" ) 
+set( CPACK_TOPLEVEL_TAG "gnsstk" )
 
 set( CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.13)" )
 set( CPACK_DEBIAN_SECTION "stable" )

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,8 +196,12 @@ install( FILES ${GNSSTK_INC_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
 # GNSSTK Library parameters
 #============================================================
 
-set_target_properties(gnsstk PROPERTIES VERSION "${GNSSTK_VERSION_MAJOR}.${GNSSTK_VERSION_MINOR}.${GNSSTK_VERSION_PATCH}"
-                                       SOVERSION "${GNSSTK_VERSION_MAJOR}")
+set_target_properties(gnsstk PROPERTIES
+  VERSION "${GNSSTK_VERSION_MAJOR}.${GNSSTK_VERSION_MINOR}.${GNSSTK_VERSION_PATCH}"
+  SOVERSION "${GNSSTK_VERSION_MAJOR}"
+  CXX_STANDARD 20
+  CXX_EXTENSIONS YES
+)
 
 #============================================================
 # Testing