Squashed 'externals/nitro/' changes from e1a64da1f..e2f038e45

e2f038e45 adjust compiler flags for clean CMake builds (#533) b871d2b9c latest from coda-oss (#532) e8ff6b444 apps: fix display of TREs from file extended header section (#529) 463c9e418 latest from coda-oss (#531) 24ff32863 -j 6 seems to work for SIX, how about NITRO? 713ee8538 -j 6 seems to work for SIX, how about NITRO? 4ccdf5b37 latest from coda-oss (#527) c71acc492 latest from coda-oss (#526) 08cbb96f9 build with older C++14 compilers (#524) git-subtree-dir: externals/nitro git-subtree-split: e2f038e4572376c73fd63e5b35a6b58f6a75fba7
ngageoint · Feb 9, 2023 · 10726f3 · 10726f3
1 parent 51536c1
commit 10726f3
Show file tree

Hide file tree

Showing 189 changed files with 6,064 additions and 680 deletions.
diff --git a/.github/workflows/frequent_check.yml b/.github/workflows/frequent_check.yml
@@ -22,7 +22,7 @@ jobs:
     - name: make
       run: |
         cd build
-        cmake --build . --config Release -j 2
+        cmake --build . --config Release -j
         cmake --build . --config Release --target install
     - name: test
       run: |
@@ -48,7 +48,7 @@ jobs:
       run: |
         cd build
         # using the default number of threads (-j) causes G++ to crash
-        cmake --build . -j 2
+        cmake --build . -j 6
         cmake --build . --target install
     - name: test
       run: |

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -52,7 +52,7 @@ jobs:
       run: |
         cd build
         # using the default number of threads (-j) causes G++ to crash
-        cmake --build . -j 2
+        cmake --build . -j 6
         cmake --build . --target install
     - name: test
       run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,31 +7,23 @@ set(CXX_STANDARD_REQUIRED true)
 if (${CMAKE_PROJECT_NAME} STREQUAL nitro)
     # we are the top-level project and are responsible for configuration
 
-    # set up warnings
+    # Always turn on "warnings as errors" to avoid lots of (meaningless?) build output;
+    # we'll dial-back warnings as necessary.
     if (MSVC)
-        # set warning level to /W4
-        string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-        string(REGEX REPLACE "/W[0-4]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-        add_compile_options(/W4)
-        add_compile_options(/wd4100) # '...': unreferenced formal parameter
-        add_compile_options(/wd4127) # conditional expression is constant
-        if (ENABLE_ASAN)
-            # https://docs.microsoft.com/en-us/cpp/sanitizers/asan?view=msvc-160
-            add_compile_options(/fsanitize=address)
-        endif()
-	add_compile_options(/std:c++14)
+       add_compile_options(/WX) # warnings as errors
+
+       if (ENABLE_ASAN)
+       	  # https://docs.microsoft.com/en-us/cpp/sanitizers/asan?view=msvc-160
+	  add_compile_options(/fsanitize=address)
+       endif()
+
     elseif (UNIX)
-        add_compile_options(
-            -Wall
-            -Wno-deprecated
-            -Wno-unused-value
-            -Wno-unused-but-set-variable
-        )
-        if (ENABLE_ASAN)
-            # https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html
-            add_compile_options(-fsanitize=address)
-        endif()
-	add_compile_options(-std=c++14)
+       add_compile_options(-Werror) # warnings as errors
+
+       if (ENABLE_ASAN)
+       	  # https://gcc.gnu.org/onlinedocs/gcc/Instrumentation-Options.html
+	  add_compile_options(-fsanitize=address)
+       endif()
     endif()
 
     if (EXISTS "${CMAKE_BINARY_DIR}/conan_paths.cmake")

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 -b main [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/.gitignore b/externals/coda-oss/.gitignore
@@ -2,8 +2,8 @@
 *~
 *.pyc
 __pycache__/
-# Build artifacts
 
+# Build artifacts
 install/
 install-*/
 target/
@@ -20,6 +20,7 @@ CMakeFiles/
 Makefile
 modules/**/Makefile
 out/
+CMakeSettings.json
 
 # Waf
 .waf-*
@@ -51,4 +52,5 @@ project.sln
 **/x64/
 *.vcxproj.user
 
-CMakeSettings.json
+# Unit-tests
+TEST_*_TMP.*
diff --git a/externals/coda-oss/CMakeLists.txt b/externals/coda-oss/CMakeLists.txt
@@ -3,13 +3,11 @@
 # Author:  Scott A. Colcord
 
 cmake_minimum_required(VERSION 3.14)
+project(coda-oss)
 
-set(TARGET_LANGUAGE c++)
 set(CMAKE_CXX_STANDARD 14)
 set(CXX_STANDARD_REQUIRED true)
 
-project(coda-oss)
-
 if (EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
     # build and package with conan
     include("${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
@@ -21,19 +19,12 @@ endif()
 if (${CMAKE_PROJECT_NAME} STREQUAL coda-oss)
     # this is the top level project
 
-    # set up warnings
+    # Always turn on "warnings as errors" to avoid lots of (meaningless?) build output;
+    # we'll dial-back warnings as necessary.
     if (MSVC)
-        # set warning level to /W3
-        string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-        string(REGEX REPLACE "/W[0-4]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-	    add_compile_options(/std:c++14)
+       add_compile_options(/WX) # warnings as errors
     elseif (UNIX)
-        add_compile_options(
-            -Wno-deprecated
-            -Wno-unused-value
-            -Wno-unused-but-set-variable
-        )
-	    add_compile_options(-std=c++14)
+       add_compile_options(-Werror) # warnings as errors
     endif()
 
     list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

diff --git a/externals/coda-oss/UnitTest/UnitTest.vcxproj b/externals/coda-oss/UnitTest/UnitTest.vcxproj
@@ -23,16 +23,16 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -64,10 +64,13 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <TreatWarningAsError>true</TreatWarningAsError>
       <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
-      <ConformanceMode>true</ConformanceMode>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <TranslateIncludes>true</TranslateIncludes>
+      <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -88,6 +91,11 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <TranslateIncludes>true</TranslateIncludes>
+      <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/externals/coda-oss/UnitTest/pch.h b/externals/coda-oss/UnitTest/pch.h
@@ -10,9 +10,12 @@
 // add headers that you want to pre-compile here
 
 #define WIN32_LEAN_AND_MEAN  // Exclude rarely-used stuff from Windows headers
+#pragma warning(push)
+#pragma warning(disable: 5105) // macro expansion producing '...' has undefined behavior
 #include <WinSock.h>
 #include <windows.h>
 #include <comdef.h>
+#pragma warning(pop)
 #undef min
 #undef max
 
@@ -46,9 +49,12 @@
 #include <future>
 #include <cassert>
 #include <tuple>
+#include <complex>
+#include <stdexcept>
 
 #include "CppUnitTest.h"
 
+#include "coda_oss/span.h"
 #include "gsl/gsl.h"
 #include "import/sys.h"
 #include "import/math.h"
@@ -58,6 +64,7 @@
 #include "import/mem.h"
 #include <mem/SharedPtr.h>
 #include <mem/AutoPtr.h>
+#include <mem/ComplexView.h>
 #include "import/cli.h"
 #include "polygon/DrawPolygon.h"
 #include "polygon/PolygonMask.h"
@@ -104,6 +111,7 @@
 #include <logging/ExceptionLogger.h>
 #include <import/logging.h>
 #include <import/re.h>
+#include "io/StringStream.h"
 
 #include "TestCase.h"
 

diff --git a/externals/coda-oss/build/build.py b/externals/coda-oss/build/build.py
@@ -891,12 +891,6 @@ def configureCompilerOptions(self):
         #       If you want the plugins to not depend on Intel libraries,
         #       configure with:
         #       --with-cflags=-static-intel --with-cxxflags=-static-intel --with-linkflags=-static-intel
-        if cxxCompiler == 'gcc':
-            config['cxx']['debug']          = '-ggdb3'
-            config['cxx']['optz_debug']     = '-Og'
-        elif cxxCompiler == 'icpc':
-            config['cxx']['debug']          = '-g'
-            config['cxx']['optz_debug']     = ''
         if cxxCompiler == 'g++' or cxxCompiler == 'icpc':
             config['cxx']['warn']           = warningFlags.split()
             config['cxx']['verbose']        = '-v'
@@ -912,10 +906,11 @@ def configureCompilerOptions(self):
             # The "fastest-possible" option is new; see comments above.
             config['cxx']['optz_fastest-possible']   =  [ config['cxx']['optz_fastest'], '-march=native' ]
 
+            self.env.append_value('CXXFLAGS', '-fPIC'.split())
             if not Options.options.enablecpp17:
-                gxxCompileFlags='-fPIC -std=c++14'
+                gxxCompileFlags='-std=c++14'
             else:
-                gxxCompileFlags='-fPIC -std=c++17'
+                gxxCompileFlags='-std=c++17'
             self.env.append_value('CXXFLAGS', gxxCompileFlags.split())
 
             # DEFINES and LINKFLAGS will apply to both gcc and g++
@@ -930,12 +925,21 @@ def configureCompilerOptions(self):
 
             self.env.append_value('LINKFLAGS', linkFlags.split())
 
-        if ccCompiler == 'gcc':
-            config['cc']['debug']          = '-ggdb3'
-            config['cc']['optz_debug']     = '-Og'
-        elif ccCompiler == 'icc':
-            config['cc']['debug']          = '-g'
-            config['cc']['optz_debug']     = ''
+        if Options.options.debugging:
+            if cxxCompiler == 'g++':
+                config['cxx']['debug'] = '-ggdb3'
+                config['cxx']['optz_debug'] = '-Og'
+            elif cxxCompiler == 'icpc':
+                config['cxx']['debug'] = '-g'
+                config['cxx']['optz_debug'] = ''
+
+            if ccCompiler == 'gcc':
+                config['cc']['debug'] = '-ggdb3'
+                config['cc']['optz_debug'] = '-Og'
+            elif ccCompiler == 'icc':
+                config['cc']['debug'] = '-g'
+                config['cc']['optz_debug'] = ''
+
         if ccCompiler == 'gcc' or ccCompiler == 'icc':
             config['cc']['warn']           = warningFlags.split()
             config['cc']['verbose']        = '-v'
@@ -952,6 +956,8 @@ def configureCompilerOptions(self):
             config['cc']['optz_fastest-possible']   =  [ config['cc']['optz_fastest'], '-march=native' ]
 
             self.env.append_value('CFLAGS', '-fPIC'.split())
+            # "gnu99" enables POSIX and BSD
+            self.env.append_value('CFLAGS', '-std=gnu99'.split())
 
     elif re.match(winRegex, sys_platform):
         crtFlag = '/%s' % Options.options.crt

diff --git a/externals/coda-oss/modules/c++/CMakeLists.txt b/externals/coda-oss/modules/c++/CMakeLists.txt
@@ -1,13 +1,18 @@
 set(TARGET_LANGUAGE c++)
-set(CMAKE_CXX_STANDARD 14)
-set(CXX_STANDARD_REQUIRED true)
 
-# turn on warnings as errors
+# turn on maximum warnings
 if (MSVC)
-    add_compile_options(/WX)
-    add_compile_options(/W4)
+    add_compile_options(/std:c++14)
+
+    # By default, there is a /W3 on the command-line from somewhere (?); adding
+    # /Wn results in a compiler warning.
+    #add_compile_options(/W4) # /Wall
+    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # /Wall
+
 elseif (UNIX)
-    add_compile_options(-Werror)
+    add_compile_options(-std=c++14)
+
+    add_compile_options(-Wall -pedantic -Wextra)
 endif()
 
 # add an interface library for unittests

diff --git a/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj b/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj
@@ -116,6 +116,7 @@
     <ClInclude Include="mem\include\mem\Align.h" />
     <ClInclude Include="mem\include\mem\AutoPtr.h" />
     <ClInclude Include="mem\include\mem\BufferView.h" />
+    <ClInclude Include="mem\include\mem\ComplexView.h" />
     <ClInclude Include="mem\include\mem\ScopedAlignedArray.h" />
     <ClInclude Include="mem\include\mem\ScopedArray.h" />
     <ClInclude Include="mem\include\mem\ScopedCloneablePtr.h" />
@@ -436,6 +437,8 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -445,16 +448,20 @@
       <WarningLevel>EnableAllWarnings</WarningLevel>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions);CODA_OSS_EXPORTS;CODA_OSS_DLL;MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>cli\include\;coda_oss\include;config\include\;except\include\;gsl\include\;io\include\;logging\include\;math\include\;math.linear\include\;math.poly\include\;mem\include\;mt\include\;plugin\include\;polygon\include\;re\include\;sio.lite\include\;std\include\;str\include\;sys\include\;tiff\include;types\include\;units\include\</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <TranslateIncludes>true</TranslateIncludes>
+      <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <EnablePREfast>true</EnablePREfast>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -469,15 +476,18 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions);CODA_OSS_EXPORTS;CODA_OSS_DLL;MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
       <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>cli\include\;coda_oss\include;config\include\;except\include\;gsl\include\;io\include\;logging\include\;math\include\;math.linear\include\;math.poly\include\;mem\include\;mt\include\;plugin\include\;polygon\include\;re\include\;sio.lite\include\;std\include\;str\include\;sys\include\;tiff\include;types\include\;units\include\</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <ControlFlowGuard>Guard</ControlFlowGuard>
-      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <TranslateIncludes>true</TranslateIncludes>
+      <UseStandardPreprocessor>true</UseStandardPreprocessor>
+      <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>

diff --git a/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj.filters b/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj.filters
@@ -720,6 +720,9 @@
     <ClInclude Include="mem\include\mem\AutoPtr.h">
       <Filter>mem</Filter>
     </ClInclude>
+    <ClInclude Include="mem\include\mem\ComplexView.h">
+      <Filter>mem</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp" />