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.

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

Sync externals #327

Merged
merged 2 commits into from
Mar 10, 2020
Merged

Sync externals #327

merged 2 commits into from
Mar 10, 2020

Conversation

JonathanMeans
Copy link
Contributor

No description provided.

227dc9d Merge pull request #175 from mdaus/cmake_build
30c24d1 Get correct type for version
7baf850 Simplify handling of xml module
d95e1ef Pass waf install target in single command
dfed191 Merge branch 'master' into cmake_build
a1db4f2 Update README with state of CMake build
c651962 Merge branch 'cmake_build' of https://github.com/mdaus/nitro into cmake_build
4c79a3a Fix Windows build
23128ab Fix install command for MATLAB
d7f40dd Fix SWIG flags
465c4be Formatting
d4cc2ac Fix building TREs
197ce05 Resolve merge conflict
546e622 Merge branch 'master' into cmake_build
4a9ef40 Merge branch 'cmake_build' of https://github.com/mdaus/nitro into cmake_build
5d81a5f Allow separate CODA home
c3caae7 Handle case where CMake can't find Python interpreter
ea3ebe3 Fix checking for Java
16362b5 Fix cgm-c target name
ae14a8d More consistent module names
5e5cd7e Clean up handling coda modules and common logic
af59415 Recurse into all directories
28841aa Add MATLAB layer
4678a52 Add Java layer
c49b41c Add CMake for Python layer

git-subtree-dir: externals/nitro
git-subtree-split: 227dc9d
@JonathanMeans JonathanMeans merged commit 290c641 into master Mar 10, 2020
@JonathanMeans JonathanMeans deleted the sync_externals branch March 10, 2020 16:15
kaydoh pushed a commit to kaydoh/six-library that referenced this pull request Feb 9, 2022
d5dafc3 Merge pull request ngageoint#330 from mdaus/fix_sys_include
1bcac55 Remove sys_config.h include
c8713c2 Merge pull request ngageoint#329 from mdaus/fix_msvs
0921105 Only recurse into directories that exist
0efc30c Merge pull request ngageoint#328 from mdaus/require_cpp11
e0a488b Merge master to resolve conflicts
d41ee9b Merge pull request ngageoint#327 from mdaus/config_setup
87b1511 Fix indentation
d3a61e1 Always add c++11 flag
fe8b00f Re add sys check for C++11 for Windows
b961b5c Require C++11
b1df36b Remove unittest option
72eea9c add waf_unit_test switch
e6f9693 Pull out config module
4995c9e Merge pull request ngageoint#326 from mdaus/shared_drivers
e611f36 Don't write def file if it already exists
5bef0e4 Allow shared build of xml and zlib
a63d1bc Allow shared build of JPEG
521f4de Strip whitespace
eee482d Merge pull request ngageoint#325 from mdaus/fix_shared_build_linux
40e5608 Fix building shared libraries on Linux
7e0a53e Merge pull request ngageoint#324 from mdaus/waf-globdirwalker-py37
8f01613 Change 'raise StopIteration' in GlobDirectoryWalker to 'return'. Rationale in PEP479. Tested with Python 2.7.12 and 3.7.2.
eb2579d Merge pull request ngageoint#323 from mdaus/explicit_version_check
4378879 Add explicit Python version check
af16c43 Merge pull request ngageoint#322 from mdaus/range-touches-empty
24e75b3 Define touching as false if either of the ranges are empty
e7a026a Merge pull request ngageoint#320 from mdaus/add_python_agnostic_build_option
5b15de9 Add Python version-agnostic build option
d57fc0e Merge pull request ngageoint#319 from mdaus/run_python_unittests
7dbeb19 Fix error running Python unittests
5f463e5 Merge pull request ngageoint#318 from mdaus/install_python_unittests
d188d63 Make build.py install Python unittests as well
a4b7ae4 Merge pull request ngageoint#317 from mdaus/range-touches
447e6ec Updated comment
6e214eb Added 'touches' member function to Range. Allows for determining if two disjoint ranges can be placed next to one another with no gap between them
143fb21 Merge pull request ngageoint#316 from mdaus/check_swig_version
0196e37 Set minimum version for building CODA
af8c9bb Fail configuration if trying to use too-old SWIG

git-subtree-dir: externals/coda-oss
git-subtree-split: d5dafc385f90d9d0f614bd20cbe4054a1319c844
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants