Review comments

Author: Mahesh Pai

common/test/CMakeLists.txt

@@ -77,26 +77,15 @@ add_executable(integration_test)
 
 target_link_libraries(integration_test count cpc density fi hll kll req sampling theta tuple quantiles common_test_lib)
 
-# Use C++17 if CMAKE_CXX_STANDARD is set to 17+, otherwise C++11
-# This allows hardening tests to use std::optional with libc++ hardening
+# Use CMAKE_CXX_STANDARD if defined, otherwise C++11
+set(_integration_cxx_standard 11)
 if(DEFINED CMAKE_CXX_STANDARD)
-  if(CMAKE_CXX_STANDARD MATCHES "17|20|23")
-    set_target_properties(integration_test PROPERTIES
-      CXX_STANDARD ${CMAKE_CXX_STANDARD}
-      CXX_STANDARD_REQUIRED YES
-    )
-  else()
-    set_target_properties(integration_test PROPERTIES
-      CXX_STANDARD 11
-      CXX_STANDARD_REQUIRED YES
-    )
-  endif()
-else()
-  set_target_properties(integration_test PROPERTIES
-    CXX_STANDARD 11
-    CXX_STANDARD_REQUIRED YES
-  )
+  set(_integration_cxx_standard ${CMAKE_CXX_STANDARD})
 endif()
+set_target_properties(integration_test PROPERTIES
+  CXX_STANDARD ${_integration_cxx_standard}
+  CXX_STANDARD_REQUIRED YES
+)
 
 add_test(
   NAME integration_test