From 1ecba12c6aad38bd463935feeded381560ae4e4a Mon Sep 17 00:00:00 2001
From: Frank Dellaert <dellaert@gmail.com>
Date: Fri, 20 Jan 2023 23:11:12 -0800
Subject: [PATCH] Removed obsolete flag and TODOs

---
 CMakeLists.txt              | 2 --
 cmake/GtsamBuildTypes.cmake | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9be0d89a9..52b34101f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,6 @@ if(NOT DEFINED CMAKE_MACOSX_RPATH)
   set(CMAKE_MACOSX_RPATH 0)
 endif()
 
-set(CMAKE_CXX_STANDARD 17)
-
 # Set the version number for the library
 set (GTSAM_VERSION_MAJOR 4)
 set (GTSAM_VERSION_MINOR 3)
diff --git a/cmake/GtsamBuildTypes.cmake b/cmake/GtsamBuildTypes.cmake
index 0db9538f2..e8f01a1f0 100644
--- a/cmake/GtsamBuildTypes.cmake
+++ b/cmake/GtsamBuildTypes.cmake
@@ -142,17 +142,14 @@ endif()
 if (NOT CMAKE_VERSION VERSION_LESS 3.8)
     set(GTSAM_COMPILE_FEATURES_PUBLIC "cxx_std_17" CACHE STRING "CMake compile features property for all gtsam targets.")
     # See: https://cmake.org/cmake/help/latest/prop_tgt/CXX_EXTENSIONS.html
-    # TODO(dellaert): is following line still needed or was that only for c++11?
     set(CMAKE_CXX_EXTENSIONS OFF)
     if (MSVC)
       # NOTE(jlblanco): seems to be required in addition to the cxx_std_17 above?
-      # TODO(dellaert): is this the right syntax below?
       list_append_cache(GTSAM_COMPILE_OPTIONS_PUBLIC /std:c++latest)
     endif()
 else()
   # Old cmake versions:
   if (NOT MSVC)
-    # TODO(dellaert): I just changed 11 to 17 below, hopefully that works
     list_append_cache(GTSAM_COMPILE_OPTIONS_PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
   endif()
 endif()