Remove refs to older C++ versions, add param to add_test function

Author: Vaughn

CMakeLists.txt

@@ -19,8 +19,6 @@ endif()
 
 if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
     # this is the top level project
-
-    # Only set std if not used as library
     set(CMAKE_CXX_STANDARD 23)
     set(CXX_STANDARD_REQUIRED true)
 
@@ -39,24 +37,14 @@ if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
     coda_initialize_build()
 
     # install our cmake build modules for downstream use
-    install(DIRECTORY "cmake/"
-            DESTINATION "${CODA_STD_PROJECT_LIB_DIR}/cmake/"
-            FILES_MATCHING PATTERN "*.cmake")
-
-    # If the package version is defined, write a version file for find_package
-    set(version_file "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake")
-    include(CMakePackageConfigHelpers)
-    write_basic_package_version_file(${version_file} VERSION ${CMAKE_PROJECT_VERSION} COMPATIBILITY SameMajorVersion)
-    install(FILES ${version_file} DESTINATION "lib/cmake")
-
-    # As opposed to drivers, these are "required" third-party packages
-    add_subdirectory(externals)
+    install(DIRECTORY "cmake" DESTINATION "lib" FILES_MATCHING PATTERN "*.cmake")
 
 endif()
 
+# As opposed to drivers, these are "required" third-party packages
+add_subdirectory("externals")
 add_subdirectory("modules")
 
 # generate package config, with the following paths exported
-set(JARS_DIR ${CODA_STD_PROJECT_LIB_DIR} CACHE INTERNAL
-    "path to installed jars, needed by downstream projects")
+set(JARS_DIR lib CACHE INTERNAL "path to installed jars, needed by downstream projects")
 coda_generate_package_config(JARS_DIR)

cmake/CodaBuild.cmake

@@ -368,6 +368,8 @@ endfunction()
 #                     the current source directory. All source files beneath
 #                     this directory will be used. Each source file is assumed
 #                     to create a separate executable.
+#   TEST_LIB        - If present, use this library to supply unit test macros,
+#                     otherwise default to Catch2WithMain from coda-oss externals
 #
 # Multi value arguments:
 #   DEPS            - Modules that the tests are dependent upon.
@@ -387,7 +389,7 @@ function(coda_add_tests)
         cmake_parse_arguments(
             ARG                         # prefix
             "UNITTEST"                  # options
-            "MODULE_NAME;DIRECTORY"     # single args
+            "MODULE_NAME;DIRECTORY;TEST_LIB"     # single args
             "DEPS;SOURCES;ARGS;FILTER_LIST"  # multi args
             "${ARGN}"
         )
@@ -421,7 +423,12 @@ function(coda_add_tests)
             add_custom_target(${test_group_tgt})
         endif()
 
-        list(APPEND ARG_DEPS ${ARG_MODULE_NAME}-${TARGET_LANGUAGE} Catch2::Catch2WithMain)
+        set(test_lib Catch2::Catch2WithMain)
+        if(ARG_TEST_LIB)
+            set(test_lib ${ARG_TEST_LIB})
+        endif()
+
+        list(APPEND ARG_DEPS ${ARG_MODULE_NAME}-${TARGET_LANGUAGE} ${test_lib})
 
         # get all interface libraries and include directories from the dependencies
         foreach(dep ${ARG_DEPS})

modules/c++/mt/include/mt/Algorithm.h

@@ -28,13 +28,8 @@
 
 #include "config/compiler_extensions.h"
 #include "config/CPlusPlus.h"
-#if CODA_OSS_cpp17
-	// <execution> is broken with the older version of GCC we're using
-	#if (__GNUC__ >= 10) || _MSC_VER
-	#include <execution>
-	#define CODA_OSS_mt_Algorithm_has_execution 1
-	#endif
-#endif
+#include <execution>
+
 
 namespace mt
 {
@@ -83,17 +78,13 @@ template <typename InputIt, typename OutputIt, typename UnaryOperation>
 inline OutputIt Transform_par(InputIt first1, InputIt last1, OutputIt d_first, UnaryOperation unary_op,
     Transform_par_settings settings = Transform_par_settings{})
 {
-#if CODA_OSS_mt_Algorithm_has_execution
-    #if __GNUC__
-        // std::execution::par is dramatically slower w/GCC than using our own ... ???
-        return Transform_par_(first1, last1, d_first, unary_op, settings); // TODO: std::execution::par
-    #else
-        CODA_OSS_mark_symbol_unused(settings);
-        return std::transform(std::execution::par, first1, last1, d_first, unary_op);
-    #endif // __GNUC__
+#if __GNUC__
+    // std::execution::par is dramatically slower w/GCC than using our own ... ???
+    return Transform_par_(first1, last1, d_first, unary_op, settings); // TODO: std::execution::par
 #else
-    return Transform_par_(first1, last1, d_first, unary_op, settings);
-#endif // CODA_OSS_mt_Algorithm_has_execution
+    CODA_OSS_mark_symbol_unused(settings);
+    return std::transform(std::execution::par, first1, last1, d_first, unary_op);
+#endif // __GNUC__
 }
 
 }

modules/c++/str/include/str/Manip.h

@@ -47,16 +47,7 @@ CODA_OSS_disable_warning_push
 template<typename CharT>
 inline CharT* data(std::basic_string<CharT>& s) noexcept
 {
-    #if CODA_OSS_cpp17
     return s.data();
-    #else
-    CODA_OSS_disable_warning_push
-    #if _MSC_VER
-    #pragma warning(disable : 26492)  // Don't use const_cast to cast away const or volatile (type.3).
-    #endif  
-    return const_cast <typename std::basic_string<CharT>::pointer>(s.data());
-    CODA_OSS_disable_warning_pop
-    #endif // CODA_OSS_cpp17
 }
 CODA_OSS_disable_warning_pop
 template <typename CharT>

modules/c++/sys/CMakeLists.txt

@@ -7,6 +7,7 @@ coda_add_module(
     VERSION 1.2
     DEPS config-c++ except-c++ str-c++ GSL)
 
+add_compile_options($<$<CXX_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-use-after-free>)
 coda_add_tests(
     MODULE_NAME ${MODULE_NAME}
     DIRECTORY "tests"
@@ -16,6 +17,3 @@ coda_add_tests(
     DIRECTORY "unittests"
     DEPS mt-c++
     UNITTEST)
-
-# Aligned alloc test throws -Werror=use-after-free
-target_compile_options(sys_test_aligned_alloc PRIVATE $<$<CXX_COMPILER_ID:GNU,Clang,AppleClang>:-Wno-use-after-free>)

modules/c++/xml.lite/unittests/test_xmlelement.cpp

@@ -32,11 +32,8 @@
 // C++20 changed the type of u8 to char8_t* https://en.cppreference.com/w/cpp/language/string_literal
 // Not putting this everywhere because (1) well, it's a macro, and (2) it's mostly
 // only test code that uses string literals.
-#if CODA_OSS_cpp20
 #define U8(s) u8##s
-#else
-#define U8(s) static_cast<const std::char8_t*>(static_cast<const void*>(s))
-#endif
+
 
 static const std::string& text()
 {