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

Sync externals #327

Merged
merged 2 commits into from
Mar 10, 2020
Merged

Sync externals #327

merged 2 commits into from
Mar 10, 2020

Commits on Mar 10, 2020

  1. Squashed 'externals/nitro/' changes from 215dc91..227dc9d 

    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 committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    dcb847c View commit details
    Browse the repository at this point in the history

  2. Merge commit 'dcb847c1b4706f8d5812cff2473d31911d003454' into sync_ext… 

    …ernals
    @JonathanMeans
    JonathanMeans committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    b267e51 View commit details
    Browse the repository at this point in the history