Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update externals #396

Merged
merged 6 commits into from
Jan 16, 2021
Merged

update externals #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1073b39
add back "java" and "mex"
Jan 16, 2021
6fca258
lates from coda-oss/main
Jan 16, 2021
1083ac1
latest from "nitro"
Jan 16, 2021
e21d4fc
paths are wrong in "externals"
Jan 16, 2021
9e21803
need to redo C++17 support
Jan 16, 2021
c10f233
std::span -> gsl::span
Jan 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
64 changes: 0 additions & 64 deletions externals/coda-oss/.github/workflows/build_unittest.yml
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions externals/nitro/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,9 @@ _deps/
CMakeFiles/
*.cmake
CMakeCache.txt
CMakeSettings.json
build/

externals/coda-oss/modules/c++/**/Makefile
modules/**/Makefile
*_config.h

# Build artifacts
target/
Expand All @@ -36,8 +33,7 @@ packages/
modules/c/j2k/external/openjpeg/openjpeg-2.0.0/
modules/c/j2k/external/jasper/jasper-1.900.1-mod/

# unittest output
# unit tests
outputPathname.ntf
*__*_band_*.man
test_writer_3++.nitf
*__*_band_*.out
sicd_*_nitf__*_band_*.man
CMakeSettings.json
2 changes: 1 addition & 1 deletion externals/nitro/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (${CMAKE_PROJECT_NAME} STREQUAL nitro)
# 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(/W3 /wd4290 /wd4512 /Zc:__cplusplus)
add_compile_options(/W3 /wd4290 /wd4512)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
elseif (UNIX)
add_compile_options(
Expand Down
4 changes: 2 additions & 2 deletions externals/nitro/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ the C and C++ layers get the most support.

The Python layer gets some use for scripting convenience.

The MATLAB and JAVA layers have not been touched in years; they are
no longer built, code remains in the **archive** directory.
The MATLAB and JAVA layers have not been touched in years.
Use at your own risk.

TREs need to be coded in C (only).

Expand Down
10 changes: 10 additions & 0 deletions externals/nitro/modules/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,13 @@ add_subdirectory("c++")
if (BUILD_PYTHON_MODULES)
add_subdirectory("python")
endif()

set(ENABLE_JAVA ON CACHE BOOL "enable building Java components")
if (ENABLE_JAVA)
add_subdirectory("java")
endif()

set(ENABLE_MEX ON CACHE BOOL "enable building Matlab MEX components")
if (ENABLE_MEX)
add_subdirectory("mex")
endif()
4 changes: 1 addition & 3 deletions externals/nitro/modules/c++/nitf-c++.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="nitf\include\import\nitf.hpp" />
<ClInclude Include="nitf\include\nitf\BandInfo.hpp" />
<ClInclude Include="nitf\include\nitf\BandSource.hpp" />
<ClInclude Include="nitf\include\nitf\BlockingInfo.hpp" />
<ClInclude Include="nitf\include\nitf\BufferedReader.hpp" />
<ClInclude Include="nitf\include\nitf\BufferedWriter.hpp" />
<ClInclude Include="nitf\include\nitf\ByteProvider.hpp" />
<ClInclude Include="nitf\include\nitf\coda-oss.hpp" />
<ClInclude Include="nitf\include\nitf\ComponentInfo.hpp" />
<ClInclude Include="nitf\include\nitf\CompressedByteProvider.hpp" />
<ClInclude Include="nitf\include\nitf\CompressionInterface.hpp" />
Expand Down Expand Up @@ -200,7 +200,6 @@
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<Optimization>Disabled</Optimization>
<LanguageStandard>Default</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>
Expand Down Expand Up @@ -228,7 +227,6 @@
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<EnforceTypeConversionRules>true</EnforceTypeConversionRules>
<WarningLevel>Level3</WarningLevel>
<LanguageStandard>Default</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>
Expand Down
Loading