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
@@ -110,8 +99,7 @@ target_sources(integration_test
 
 # Separate hardening test executable (header-only, no pre-compiled libs)
 # This ensures the sketch code is compiled with C++17 + hardening
-# Always build this target - it will use CMAKE_CXX_STANDARD if set, otherwise C++17
-message(STATUS "CMAKE_CXX_STANDARD = ${CMAKE_CXX_STANDARD}")
+# Always build this target - it will use CMAKE_CXX_STANDARD if set (and >= 17), otherwise C++17
 
 add_executable(hardening_test)
 target_link_libraries(hardening_test common common_test_lib)
@@ -125,19 +113,15 @@ target_include_directories(hardening_test PRIVATE
 )
 
 # Use C++17 minimum for hardening tests
-if(CMAKE_CXX_STANDARD AND CMAKE_CXX_STANDARD GREATER_EQUAL 17)
-  set_target_properties(hardening_test PROPERTIES
-    CXX_STANDARD ${CMAKE_CXX_STANDARD}
-    CXX_STANDARD_REQUIRED YES
-  )
-  message(STATUS "hardening_test will use C++${CMAKE_CXX_STANDARD}")
-else()
-  set_target_properties(hardening_test PROPERTIES
-    CXX_STANDARD 17
-    CXX_STANDARD_REQUIRED YES
-  )
-  message(STATUS "hardening_test will use C++17 (default)")
+set(_hardening_cxx_standard 17)
+if(DEFINED CMAKE_CXX_STANDARD AND CMAKE_CXX_STANDARD GREATER_EQUAL 17)
+  set(_hardening_cxx_standard ${CMAKE_CXX_STANDARD})
 endif()
+set_target_properties(hardening_test PROPERTIES
+  CXX_STANDARD ${_hardening_cxx_standard}
+  CXX_STANDARD_REQUIRED YES
+)
+message(STATUS "hardening_test will use C++${_hardening_cxx_standard}")
 
 add_test(
   NAME hardening_test