Squashed 'externals/coda-oss/' changes from 54033e70e..d723792a2

d723792a2 Build cleanly with cmake "release" (#765)
625b2860f settings unused of we have std::transform(par
82d54124a add back transform_async() as Transform_par() (#764)
63659eede provide a simple implementation of std::experimental::simd (#763)
59a47c70e update to latest versions of various actions (#762)
f98c13c38 add missing #include
b173830ca fix C++17 overload resolution
ed283d676 Only need to actually create/destroy Xerces once (#761)
8087b1e11 utility routines to convert to/from collections of paths
a869c8a8e use a lookup table for str::upper() and str::lower() (#760)
00e343177 Merge branch 'main' of https://github.com/mdaus/coda-oss
27085f06b DefaultErrorHandler is a base class
98ec79835 favor speed over size
28926b673 provide our own (simple) mdspan implementation (#759)
6bb722454 make SpanRC API match std::mdspan (#758)
df4e0fc1f changes to build SIX DLLs (#757)
faf5d0521 allow CMake to switch between building SHARED (DLLs) or STATIC libraires
d15173f38 export symbols used by NITRO (#756)
6ed3c048b use Debug DLL library in Debug
5eae4c1f6 turn of /Wall for MSVC (#755)
47d4b6b73 return type needs to be explicit (not `auto`) for subsequent specialization
aea8e7b1e reduce use of str::toString() (#754)
8062154a4 HighFive 2,8,0 (#753)
92f8b88c7 std::ostringstream overloads
8cb27de27 reduce use of .c_str() and .str() (#752)
3ae8f6afb Merge pull request #751 from mdaus/bugfix/hdf5-missing-files-main
3ec510861 Add missing files
1693eac7e Update build_unittest.yml
03f1a3bdf release 2023-10-23 (#747)
4dd7b2fbd Merge branch 'main' of github.com:mdaus/coda-oss
9428f12a0 add extensions for .log and known Windows/Linux binaries (#746)
c3fd20a88 added some OLD Visual Studio extensions
d00db384a everything is text except for known binaries
c3813bb29 eol=lf is the default
4a2f472c7 add extensions for .log and known Windows/Linux binaries (#746)
18f2c051f more FmtX() -> str::Format() changes (#745)
959532681 reduce use of FmtX macro (#743)
fffac7fc4 Fix memory leaks in "cli" (#741)
95ff879ba make it easier to turn on AVX2/AVX512F (#740)
a950c848b enable AVX2 and AVX512F CMake builds (#739)
369737085 use std::ssize() to reduce casts (#738)
8ae7dabac std::size() and std::ssize() (#737)
8db480be5 enable ASAN for GitHub builds (#736)
c92a55d7c build in SIX
333b91024 Squashed commit of the following:
ac8c312db Only allow va_args formatting under controlled circumstances (#735)
589aacfd7 str::to_native() for when conversion to std::string really is needed
743feb41e try hard not to lose string encoding (#734)
1854a9b46 hide use of str::cast() inside `details` namespace (#733)
fbe0c85f9 compile-time getSIMDInstructionSet() (#732)
ee2c46358 more consistent naming for routines to convert between encodings (#731)
00e2dd928 another FmtX() overload
165a799c5 more FmtX() overloads (#729)
8dee6f7a6 revert toString() changes (#728)
bf7ae4a71 use overloads rather than varargs for std::format() (#727)
22e050207 utility routines to reduce duplicated code (#726)
a5ea60647 remove str::EncodedStringView (#725)
168cbae01 reduce differences between 'main' and 'cpp17' (#724)
5b892bf5f release 2023-08-18 (#723)
0b1327d1e restore mem::AutoPtr; too much of a hassle moving it to numpyutils :-( (#722)
7691adb56 normalize line endings (#721)
b7d50efdd update to HDF5 1.14.2 (#720)
fcc96ec69 Update .gitattributes (#719)
bb82a94c9 xerces-c 3.2.4 (#718)
ef4ad7cf3 Update to e2fsprogs 1.47.0 (#717)
b4ca18a11 fix compiler warning about order of operations
a5df5b823 update to HighFive 2.7.1 (#716)
4109ee5d2 `mem::AutoPtr` is only for Python bindings (#715)
00d843f87 remove hdf5.lite (#714)
443dd3825 Reduce compiler warnings, speed up builds (#713)
d60861821 get optional working with partial C++17 (#712)
d5bd0d804 "warning STL4036: <ciso646> is removed in C++20."
c19ece7f9 Don't interfere with a partial C++20 implementation (#711)
065e86ddc operator==() for QName (#710)
1c16380ce remove zint* typedefs; don't want to encourage use of types::Complex (#709)
6dd247991 our optional<> is now closer to C++17 (#708)
87ac61739 strict checking on `std::complex<T>` is too much of a hassle for now
034d52c86 overloads to byte-swap type::Complex are too much trouble (#707)
42d449c33 sys::byteSwap overloads for types::Complex<T> (#705)
4092fd8e7 remove work-around for NITRO bug (#704)
e2472acfc build in NITRO and SIX (#703)
32ccf9105 Use same build paths as Visual Studio (#701)
366ac9f43 Another round of removing compiler warnings (#702)
a7f8ef260 Fix compile warnings from building CODA (#700)
f70b4202f account for coda-oss.vcxproj being in other SLNs
af3faebfc Remove more compiler/code-analysis warnings (#699)
82be2a6db unittests should work w/o install (#698)
dbb90a06d add msbuild for coda-oss.sln (#697)
5a417140a reduce compiler warnings (#696)
288619dfa all modules now part of coda-oss.vcxproj (#695)
c2fc5fc66 add more projects to coda-oss-lite.vcxproj (#694)
ceb86c186 support $(PlatformToolset) as a "special" environment variable (#693)
d78a8595a OS::getSIMDInstructionSet() utility (#692)
2d2df467d fix `python3 waf dumplib`

git-subtree-dir: externals/coda-oss
git-subtree-split: d723792a27b25de0f1ab4c60c42681a01430c77f

.gitignore

@@ -1,67 +1,56 @@
-*.whl
-*.pyc
-*~
 *.swp
-*venv
-
-# Eclipse
-.cproject
-.project
-
-# VS Code
-.vscode
-packages/
-.vs
-*.vcxproj.user
-
-# Waf
-.lock-waf*
-.waf*
+*~
+*.pyc
+__pycache__/
 
 # Build artifacts
-target/
-target.dbg/
 install/
-install.dbg/
-**/install-*/
-test_package/build/
-out/build/
-out/install/
+install-*/
+target/
+
+# Conan
+modules/drivers/**/build
 test_package/build/
-*.pyc
-*.swp
-.depproj
-**/Debug/
-**/Release/
-*.a
-*.so*
 
 # CMake
 _deps/
-CMakeFiles/
 CMakeCache.txt
-CMakeSettings.json
-# cmake generates these Makefiles
-externals/*/Makefile
-externals/coda-oss/modules/c++/**/Makefile
-externals/coda-oss/modules/python/**/Makefile
-externals/nitro/modules/**/Makefile
-Makefile
-six/Makefile
-six/modules/**/Makefile
+CMakeFiles/
 *_config.h
-*_config.hpp
-# ignore build directories ...
-build/
+Makefile
+modules/**/Makefile
 out/
-# ... but not coda-oss/build
-!/externals/coda-oss/build/
+CMakeSettings.json
 
-# Drivers
-six/projects/csm/external/csm-master/
+# Waf
+.waf-*
+waf-*
+.waf3-*
+waf3-*
+.lock-waf*
+build/waf*/
+
+# Eclipse
+.project
+.cproject
 
-# Giant test files
-regression_files/
-six/modules/c++/cphd/tests/sample_cphd/
-outputPathname.ntf
+# Drivers
+modules/drivers/fftw/fftw-2.1.*/
+modules/drivers/jpeg/jpeg-9/
+modules/drivers/jpeg/jpeg-9d/
+modules/drivers/j2k/openjpeg/openjpeg-2.3.*_mod/
+modules/drivers/pcre/pcre2-10.*/
+modules/drivers/uuid/e2fsprogs-1.*.*/
+modules/drivers/xml/xerces/xerces-c-*/
+modules/drivers/zlib/zlib-1.2.*/
+
+# VS
+.vs/
+project.sln
+.depproj/
+*.tlog
+**/x64/
+*.vcxproj.user
 
+# Unit-tests
+TEST_*_TMP*.*

CMakeLists.txt

@@ -1,43 +1,49 @@
+# - CODA-OSS CMake Build script.
+#
+# Author:  Scott A. Colcord
+
 cmake_minimum_required(VERSION 3.14)
-project(six-library)
+project(coda-oss)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CXX_STANDARD_REQUIRED true)
 
-if (${CMAKE_PROJECT_NAME} STREQUAL six-library)
-    # we are the top-level project and are responsible for configuration
+if (EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
+    # build and package with conan
+    include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
+    conan_basic_setup()
+
+    include("${CMAKE_BINARY_DIR}/conan_paths.cmake")
+endif()
+
+if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
+    # this is the top level project
 
     # Always turn on "warnings as errors" to avoid lots of (meaningless?) build output;
     # we'll dial-back warnings as necessary.
     if (MSVC)
        add_compile_options(/WX) # warnings as errors
-       add_compile_options(/MP) # multi-processor build
+       add_compile_options(/MP) # multi-processor compile
     elseif (UNIX)
        add_compile_options(-Werror) # warnings as errors
     endif()
 
-    if (EXISTS "${CMAKE_BINARY_DIR}/conan_paths.cmake")
-        # use pre-built dependencies from conan packages
-        include("${CMAKE_BINARY_DIR}/conan_paths.cmake")
-        find_package(coda-oss REQUIRED)
-        find_package(nitro REQUIRED)
-        include(CodaBuild)
-        coda_initialize_build()
-    else()
-        # build dependencies ourselves
-        set(CODA_OSS_DIR "coda-oss")
-        list(APPEND CMAKE_MODULE_PATH
-             "${CMAKE_CURRENT_SOURCE_DIR}/externals/${CODA_OSS_DIR}/cmake")
-        include(CodaBuild)
-        coda_initialize_build()
-        add_subdirectory("externals")
-    endif()
-endif()
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+    include(CodaBuild)
 
-# needed to run some unit tests from the build directory
-file(COPY "croppedNitfs"
-     DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+    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")
+endif()
 
-add_subdirectory(six)
+add_subdirectory("modules")
 
-coda_generate_package_config()
+# 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(SWIG_INCLUDE_DIR "${CODA_STD_PROJECT_INCLUDE_DIR}/swig" CACHE INTERNAL
+    "path to installed SWIG includes, needed by downstream projects")
+coda_generate_package_config(JARS_DIR SWIG_INCLUDE_DIR)

LICENSE

@@ -1,4 +1,4 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
+GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>