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

Merge develop into master #13

Merged
merged 21 commits into from
Jun 26, 2020
Merged

Merge develop into master #13

merged 21 commits into from
Jun 26, 2020

Conversation

kgerheiser
Copy link
Contributor

v2.3.0 with CMake build

climbfuji and others added 21 commits November 19, 2019 16:02
@climbfuji
modifications for macOS clang/gfortran build
233e775
@mark-a-potts
Merge pull request #1 from climbfuji/macos_gnu_build
0d7c077 
macOS + GNU build
@climbfuji
Correct typo in CMakeLists.txt
88d78c7
@mark-a-potts
Merge pull request #2 from climbfuji/update_ufs_release_1p0_macos_gnu
5997fa1 
Update ufs_release_1.0 for macOS/GNU support
@climbfuji
Fix typo in CMakeLists.txt
0807b7e
@climbfuji
Merge pull request #3 from climbfuji/dom_cleanup_work_20191206
4b48275 
ufs_release_1.0: cleanup work 2020/01/06
@kgerheiser
Re-factor CMakeLists.txt to use more modern features
d712e2a
@kgerheiser
Update CMake version required
f76210e
@kgerheiser
Fix how Intel compile options with spaces in them are handled
21c9336
@kgerheiser
Merge pull request #4 from kgerheiser/ufs_release_v1.0
06d99bf 
Ufs release v1.0
@aerorahul
move everything from root directory to libsrc as is in the parent CRT…
9bab815 
…M repository

Change-Id: Iec07d93e46739bf95f9998c41e8c6765c4952c48
@aerorahul
cleanup crtm. remove unnecessary makefiles.
8a8f88f 
Change-Id: Ida4211beaa41ba40250e566c5aaa143c2cfcad13
@aerorahul
rename CRTM_Module.F to CRTM_Module.F90 as is the case in the JCSDA r…
b82408b 
…epo. Add README.md

Change-Id: I3139988bf1c6cfe8d557339ac0cc3dd759abbc13
@climbfuji
Add LGPL license to repository
ac0d1ac
@climbfuji
Merge pull request #5 from climbfuji/add_lgpl_license
8b0bad4 
Add LGPL license to repository
@aerorahul
Merge branch 'release/public-v1' into feature/cleanup
5b50f35
@mark-a-potts
Merge pull request #6 from aerorahul/feature/cleanup
cb01f17 
Feature/cleanup
@aerorahul
cmake package (#8)
dfbbcca 
* add packageconfig

Change-Id: Ifb0beb698119f5f57bea93128abf6ea5c07d5fd4

* add build action

Change-Id: I7b3e13c1c1f6398b10738c09af0de600dc72bada

* Update main.yaml
@kgerheiser
Print message when package is found (#9)
e7b1c81 
Print location and version when config is found
@kgerheiser
Make install relocatable
34620d2 
Use relative path in install location of modules
@kgerheiser
Merge pull request #11 from NOAA-EMC/feature/relocatable-install
1c5cc6c 
Make install relocatable
@kgerheiser kgerheiser requested a review from aerorahul June 26, 2020 18:02
aerorahul
aerorahul approved these changes Jun 26, 2020
View reviewed changes
Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it is largely a re-organization and inclusion of a CMake build capability.

@kgerheiser kgerheiser merged commit 743bf59 into master Jun 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aerorahul aerorahul aerorahul approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kgerheiser @aerorahul @climbfuji @mark-a-potts