Squashed 'externals/nitro/' changes from b4eda9fe9..3118941cc

3118941cc update various actions to latest versions (#608) REVERT: b4eda9fe9 Merge branch 'main' into cpp17 REVERT: c2db13649 Merge branch 'main' into cpp17 REVERT: 497333fa9 Merge commit '53df008c44d7b20254ce928c3b8ceed1971ba496' into cpp17 REVERT: 53df008c4 Squashed 'externals/coda-oss/' changes from 3770d07584..86ec09d4ef REVERT: c5a06b5ae Merge commit 'b5f4e18f2ef590b39d639a96c174a27dacc9bcd7' into cpp17 REVERT: b5f4e18f2 Squashed 'externals/coda-oss/' changes from 0ed92d85a7..3770d07584 REVERT: 31a5bfa10 Merge branch 'main' into cpp17 REVERT: f6179b4e1 Merge branch 'main' into cpp17 REVERT: 19b260009 Merge branch 'main' into cpp17 REVERT: b5d609a0a need #pragma warning(disable) outside push/pop REVERT: 5efbb0c81 Squashed 'externals/coda-oss/' changes from aba8366d8b..0ed92d85a7 REVERT: 185f02f14 Merge commit '5efbb0c81357a6ee4da4209e42668c942cb915da' into cpp17 REVERT: 0678478cb latest from CODA-OSS REVERT: 3afd90921 develop/sync_externals REVERT: d0d99025d Squashed 'externals/coda-oss/' changes from 1ec9a072c4..aba8366d8b REVERT: c16779d74 Merge commit 'd0d99025d060792e63273741fab6e4a99700b49a' into cpp17 REVERT: 2f4fef813 latest from CODA-OSS REVERT: 261f3752f Merge branch 'main' into cpp17 REVERT: 4f1a05b23 /guard:cf REVERT: b5612a7df enable "WarningsAsErrors" for DEBUG builds REVERT: f067a751a Squashed 'externals/coda-oss/' changes from 5015192abb..1ec9a072c4 REVERT: 2f47cc122 Merge commit 'f067a751ac940fc485c06f003e2e2c23071a8766' into cpp17 REVERT: 50a3500ec Merge branch 'main' into cpp17 REVERT: c899f14ad Merge branch 'main' into cpp17 REVERT: f9ff61eb9 Squashed 'externals/coda-oss/' changes from 8b21c3828b..5015192abb REVERT: 50c75444b Merge commit 'f9ff61eb905ed2119f4f908c568b577643cf42f8' into cpp17 REVERT: d37a0d078 latest from CODA-OSS REVERT: c2372d744 Merge branch 'main' into cpp17 REVERT: 9618cb382 Merge branch 'main' into cpp17 REVERT: eba459da4 Squashed 'externals/coda-oss/' changes from e573adb323..8b21c3828b REVERT: c3ad6c72e Merge commit 'eba459da43c07c6a3d80b63248c9c7fb49605723' into cpp17 REVERT: 0355e94ea latest from CODA-OSS REVERT: 325fba327 Merge branch 'cpp17' of github.com:mdaus/nitro into cpp17 REVERT: 7558c7085 develop/sync_externals REVERT: 2490f6fdc Merge branch 'main' into cpp17 REVERT: 4aa042353 turn off "Warnings as Errors" to fix github builds REVERT: 45cd3febe turn off code-analysis to fix GitHub builds REVERT: 911c7b3ae Squashed 'externals/coda-oss/' changes from eb60210ff2..e573adb323 REVERT: 80a517fcb Merge commit '911c7b3ae49e1f92b94f2dc83d7716b7abc459c2' into cpp17 REVERT: c3e3d3768 add config.h files REVERT: 1cca072bd latest from CODA-OSS REVERT: cb5d115bc Squashed 'externals/coda-oss/' changes from 434b85fe53..eb60210ff2 REVERT: 8a3df82fb Merge commit 'cb5d115bcc2ecc11f81e4ccad23caff4f3f8ac29' into cpp17 REVERT: dc3074153 Merge branch 'main' into cpp17 REVERT: b40d3f96f Squashed 'externals/coda-oss/' changes from b6ead418cf..434b85fe53 REVERT: cca11bf4c Merge commit 'b40d3f96fff13bf708f319c684348ebd9884aff1' into cpp17 REVERT: 2d6d5aa31 Merge branch 'main' into cpp17 REVERT: d32176660 Merge branch 'main' into cpp17 REVERT: a8e6556aa Squashed 'externals/coda-oss/' changes from 07bcb3a39b..b6ead418cf REVERT: 53596f720 Merge commit 'a8e6556aa7bc5c105d3b4383589da7ef48982deb' into cpp17 REVERT: 29ccecf64 latest from CODA-OSS REVERT: b315d9b6c Merge branch 'main' into cpp17 REVERT: b708bd8ea `final` for NITFException REVERT: a2af78776 don't need FmtX() with no formatting REVERT: 368cead55 Squashed 'externals/coda-oss/' changes from 70a006d8a4..07bcb3a39b REVERT: 9b10c5340 Merge commit '368cead55f182d12953a6964b2598021f9629cf3' into cpp17 REVERT: 6e40d15b4 latest from CODA-OSS REVERT: 31fc61888 develop/sync_externals REVERT: eab6b6c35 Squashed 'externals/coda-oss/' changes from 14f0b1545c..70a006d8a4 REVERT: ff335eeaf Merge commit 'eab6b6c35439c1eb7fa22fb042aae4a61a936d66' into cpp17 REVERT: 5648a0267 Merge branch 'main' into cpp17 REVERT: 4fbdccb89 Squashed 'externals/coda-oss/' changes from c92a55d7c7..14f0b1545c REVERT: 732538e80 Merge commit '4fbdccb89c89f2253ae8c3fbe830e69e338ae1ac' into cpp17 REVERT: fe8900094 Merge branch 'main' into cpp17 REVERT: 331deafa2 Merge commit 'afc15cad7caa998e32e6630489dbc22be8e5e9d5' into cpp17 REVERT: afc15cad7 Squashed 'externals/coda-oss/' changes from 8dee6f7a68..a8c5a3b2b2 REVERT: 5b47be120 latest from CODA-OSS REVERT: 475d30a6e Merge branch 'main' into cpp17 REVERT: 10befb769 Merge branch 'main' into cpp17 REVERT: a5bd34266 Merge commit 'b1f170ff084565365cdca72e88b87c80b7f848ba' into cpp17 REVERT: b1f170ff0 Squashed 'externals/coda-oss/' changes from e87c32b4de..436289c928 REVERT: d6efa7ec5 restore C++17 git-subtree-dir: externals/nitro git-subtree-split: 3118941cc2b26c895f12cd5345ee6dc01a82a7ec
ngageoint · Jan 16, 2024 · 35be198 · 35be198
1 parent 95deada
commit 35be198
Show file tree

Hide file tree

Showing 986 changed files with 307 additions and 333,922 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -15,15 +15,20 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [ "main" ]
   schedule:
-    - cron: '19 23 * * 3'
+    - cron: '35 17 * * 6'
 
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
       actions: read
       contents: read
@@ -32,41 +37,44 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'cpp' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        language: [ 'c-cpp' ]
+        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
 
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |
-    #   echo "Run, Build Application using script"
-    #   ./location_of_script_within_repo/buildscript.sh
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/frequent_check.yml b/.github/workflows/frequent_check.yml
@@ -14,9 +14,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
       with:
         python-version: '3.7'
     - name: configure
@@ -34,7 +34,7 @@ jobs:
         cd out
         ctest -C ${{ matrix.configuration }} --output-on-failure
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild
       with:
         msbuild-architecture: x64
     - name: msbuild
@@ -51,7 +51,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: configure CODA-OSS
       run: |
         mkdir externals\coda-oss\out
@@ -63,7 +63,7 @@ jobs:
         cmake --build . --config ${{ matrix.configuration }} -j
         cmake --build . --config ${{ matrix.configuration }} --target install
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2 # https://github.com/marketplace/actions/setup-msbuild
+      uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild
       with:
         msbuild-architecture: x64
     - name: msbuild
@@ -87,9 +87,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
       with:
         python-version: '3.7'
     - name: configure

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,9 +17,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
       with:
         python-version: '3.7'
     - name: configure
@@ -37,7 +37,7 @@ jobs:
         cd out
         ctest -C ${{ matrix.configuration }} --output-on-failure
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2 # https://github.com/marketplace/actions/setup-msbuild
+      uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild
       with:
         msbuild-architecture: x64
     - name: msbuild
@@ -54,7 +54,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: configure CODA-OSS
       run: |
         mkdir externals\coda-oss\out
@@ -66,7 +66,7 @@ jobs:
         cmake --build . --config ${{ matrix.configuration }} -j
         cmake --build . --config ${{ matrix.configuration }} --target install
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1 # https://github.com/marketplace/actions/setup-msbuild
+      uses: microsoft/setup-msbuild@v1.1 # https://github.com/marketplace/actions/setup-msbuild
       with:
         msbuild-architecture: x64
     - name: msbuild
@@ -90,9 +90,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4 # https://github.com/marketplace/actions/checkout
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5 # https://github.com/marketplace/actions/setup-python
       with:
         python-version: '3.7'
     - name: configure

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.14)
 project(nitro)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CXX_STANDARD_REQUIRED true)
 
 if (${CMAKE_PROJECT_NAME} STREQUAL nitro)

diff --git a/UnitTest/UnitTest.vcxproj b/UnitTest/UnitTest.vcxproj
@@ -64,13 +64,10 @@
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <TreatWarningAsError>true</TreatWarningAsError>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <UseStandardPreprocessor>true</UseStandardPreprocessor>
-      <TreatWarningAsError>true</TreatWarningAsError>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
@@ -91,14 +88,11 @@
       <UseFullPaths>true</UseFullPaths>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <UseStandardPreprocessor>true</UseStandardPreprocessor>
-      <ControlFlowGuard>Guard</ControlFlowGuard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/copy_externals.csh b/copy_externals.csh
@@ -1,7 +1,7 @@
 #!/bin/csh -f
 
 rm -r -f tmp && mkdir tmp && cd tmp
-git clone --depth 1 -b cpp17 [email protected]:mdaus/coda-oss.git
+git clone --depth 1 -b main [email protected]:mdaus/coda-oss.git
 rm -r -f coda-oss/.git
 
 cd ..

diff --git a/externals/coda-oss/.github/workflows/build_unittest.yml b/externals/coda-oss/.github/workflows/build_unittest.yml
@@ -58,7 +58,7 @@ jobs:
         os: [windows-latest]
         platform: [x64]
         configuration: [Debug] # Debug turns on more compiler warnings
-        avx: [AVX512F]
+        avx: [AVX2, AVX512F]
     name: ${{ matrix.os }}-${{ matrix.avx }}-msbuild
     runs-on: ${{ matrix.os }}
 
@@ -110,10 +110,7 @@ jobs:
       run: |
         env
         which python
-        mkdir target
-        cd target
-        export CC=gcc-11
-        export CXX=g++-11
+        mkdir target && cd target
         cmake .. -DCMAKE_INSTALL_PREFIX=install${{ matrix.os }}CMake-Github -DPYTHON_VERSION=${{ matrix.python-version }} -DENABLE_SWIG=ON
     - name: build
       run: |
@@ -135,7 +132,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         configuration: [Debug, Release]
-        avx: [AVX512F]
+        avx: [AVX2, AVX512F]
     name: ${{ matrix.os }}-${{ matrix.configuration }}-${{ matrix.avx }}-CMake
     runs-on: ${{ matrix.os }}
     steps:
@@ -158,7 +155,7 @@ jobs:
   build-waf:
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-2019]
         python-version: ['3.7']
         debugging: ['--enable-debugging', '']
     name: ${{ matrix.os }}-${{ matrix.python-version }}-waf${{ matrix.debugging }}
@@ -174,8 +171,6 @@ jobs:
       run: |
         pip install numpy
         mkdir install${{ matrix.os }}Waf-Github
-        export CC=gcc-11
-        export CXX=g++-11
         python waf configure --prefix="$PWD/install${{ matrix.os }}Waf-Github" --enable-swig ${{ matrix.debugging }}
     - name: configure_without_swig
       if: ${{ matrix.os == 'windows-2019' }}

diff --git a/externals/coda-oss/CMakeLists.txt b/externals/coda-oss/CMakeLists.txt
@@ -5,7 +5,7 @@
 cmake_minimum_required(VERSION 3.14)
 project(coda-oss)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CXX_STANDARD_REQUIRED true)
 
 if (EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")

diff --git a/externals/coda-oss/UnitTest/UnitTest.vcxproj b/externals/coda-oss/UnitTest/UnitTest.vcxproj
@@ -27,6 +27,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
@@ -55,7 +56,7 @@
       <WarningLevel>Level4</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;$(ProjectDir);$(SolutionDir)modules\c++;$(SolutionDir)modules\c++\avx\include;$(SolutionDir)modules\c++\cli\include;$(SolutionDir)modules\c++\config\include;$(SolutionDir)modules\c++\coda_oss\include;$(SolutionDir)modules\c++\gsl\include;$(SolutionDir)modules\c++\hdf5.lite\include;$(SolutionDir)modules\c++\io\include;$(SolutionDir)modules\c++\std\include;$(SolutionDir)modules\c++\str\include;$(SolutionDir)modules\c++\sys\include;$(SolutionDir)modules\c++\except\include;$(SolutionDir)modules\c++\logging\include;$(SolutionDir)modules\c++\math\include;$(SolutionDir)modules\c++\math.linear\include;$(SolutionDir)modules\c++\math.poly\include;$(SolutionDir)modules\c++\mem\include;$(SolutionDir)modules\c++\mt\include;$(SolutionDir)modules\c++\polygon\include;$(SolutionDir)modules\c++\re\include;$(SolutionDir)modules\c++\types\include;$(SolutionDir)modules\c++\units\include;$(SolutionDir)modules\c++\xml.lite\include;$(SolutionDir)modules\c++\zip\include;$(SolutionDir)modules\drivers;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions);MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1;CODA_OSS_LIBRARY_SHARED=1</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions);MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1</PreprocessorDefinitions>
       <UseFullPaths>true</UseFullPaths>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -68,8 +69,6 @@
       <ConformanceMode>true</ConformanceMode>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -85,7 +84,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;$(ProjectDir);$(SolutionDir)modules\c++;$(SolutionDir)modules\c++\avx\include;$(SolutionDir)modules\c++\cli\include;$(SolutionDir)modules\c++\config\include;$(SolutionDir)modules\c++\coda_oss\include;$(SolutionDir)modules\c++\gsl\include;$(SolutionDir)modules\c++\hdf5.lite\include;$(SolutionDir)modules\c++\io\include;$(SolutionDir)modules\c++\std\include;$(SolutionDir)modules\c++\str\include;$(SolutionDir)modules\c++\sys\include;$(SolutionDir)modules\c++\except\include;$(SolutionDir)modules\c++\logging\include;$(SolutionDir)modules\c++\math\include;$(SolutionDir)modules\c++\math.linear\include;$(SolutionDir)modules\c++\math.poly\include;$(SolutionDir)modules\c++\mem\include;$(SolutionDir)modules\c++\mt\include;$(SolutionDir)modules\c++\polygon\include;$(SolutionDir)modules\c++\re\include;$(SolutionDir)modules\c++\types\include;$(SolutionDir)modules\c++\units\include;$(SolutionDir)modules\c++\xml.lite\include;$(SolutionDir)modules\c++\zip\include;$(SolutionDir)modules\drivers;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1;CODA_OSS_LIBRARY_SHARED=1</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions);MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1</PreprocessorDefinitions>
       <UseFullPaths>true</UseFullPaths>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -96,8 +95,6 @@
       <ConformanceMode>true</ConformanceMode>
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>

diff --git a/externals/coda-oss/build/build.py b/externals/coda-oss/build/build.py
@@ -756,7 +756,7 @@ def options(opt):
     opt.add_option('--enable-debugging', action='store_true', dest='debugging',
                    help='Enable debugging')
     opt.add_option('--enable-cpp11', action='callback', callback=deprecated_callback)
-    opt.add_option('--enable-cpp17', action='callback', callback=deprecated_callback)
+    opt.add_option('--enable-cpp17', action='store_true', dest='enablecpp17')
     opt.add_option('--enable-64bit', action='callback', callback=deprecated_callback)
     opt.add_option('--enable-32bit', action='callback', callback=deprecated_callback)
     opt.add_option('--with-cflags', action='store', nargs=1, dest='cflags',
@@ -812,7 +812,7 @@ def options(opt):
                     'results. NOOP if junit_xml cannot be imported')
 
 
-def ensureCpp17Support(self):
+def ensureCpp14Support(self):
     # DEPRECATED.
     # Keeping for now in case downstream code is still looking for it
     self.env['cpp11support'] = True
@@ -914,7 +914,10 @@ def configureCompilerOptions(self):
             config['cxx']['optz_fastest-possible']   =  [ config['cxx']['optz_faster'], '-march=native' ]  # -march=native instead of haswell
 
             self.env.append_value('CXXFLAGS', '-fPIC'.split())
-            gxxCompileFlags='-std=c++17'
+            if not Options.options.enablecpp17:
+                gxxCompileFlags='-std=c++14'
+            else:
+                gxxCompileFlags='-std=c++17'
             self.env.append_value('CXXFLAGS', gxxCompileFlags.split())
 
             # DEFINES and LINKFLAGS will apply to both gcc and g++
@@ -1024,7 +1027,11 @@ def configureCompilerOptions(self):
                   'WIN32 _USE_MATH_DEFINES NOMINMAX _CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN'.split()
         flags = '/UUNICODE /U_UNICODE /EHs /GR'.split()
 
-        flags.append('/std:c++17')
+        #If building with cpp17 add flags/defines to enable auto_ptr
+        if Options.options.enablecpp17:
+            flags.append('/std:c++17')
+        else:
+            flags.append('/std:c++14')
 
         self.env.append_value('DEFINES', defines)
         self.env.append_value('CXXFLAGS', flags)
@@ -1245,7 +1252,7 @@ def configure(self):
     if Options.options._defs:
         env.append_unique('DEFINES', Options.options._defs.split(','))
     configureCompilerOptions(self)
-    ensureCpp17Support(self)
+    ensureCpp14Support(self)
 
     env['PLATFORM'] = sys_platform
 

diff --git a/externals/coda-oss/cmake/CodaBuild.cmake b/externals/coda-oss/cmake/CodaBuild.cmake
@@ -146,13 +146,6 @@ macro(coda_initialize_build)
     set(CMAKE_CXX_STANDARD_REQUIRED ON)
     set(CMAKE_CXX_EXTENSIONS OFF)
 
-    # Turn on AVX2 by default ... it's from 2013.
-    if (NOT ENABLE_AVX512F)
-        if (NOT DISABLE_AVX2)
-            set(ENABLE_AVX2 true)
-        endif()
-    endif()
-
     # MSVC-specific flags and options.
     if (MSVC)
         set_property(GLOBAL PROPERTY USE_FOLDERS ON)