-
Notifications
You must be signed in to change notification settings - Fork 0
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
Cmake updates #1
Conversation
At this point, it's pretty klunky -- no netcdf support, forces compiler to be gfortran. But it should get cmake tested in travis, which is a good start.
Travis CI provides cmake 3.9.2 (we are using an old linux distribution so the apt-get versions of gfortran and libnetcdf-dev play nicely together); hoping there aren't actually features introduced in 3.10 in the system...
I set up a pull request in my own fork just to trigger Travis builds, and 1cb7ba2 failed with
but it looks like b583d7d is fine |
Also modified build.sh and run.sh to follow directions laid out in the README (created cmake_bin/ for build target, build.sh calls "make install" and run.sh runs from cmake_bin/bin/)
4c61476 also passes Travis tests, so I think this branch is ready to merge and then we can continue discussion on CVMix#88 |
@mnlevy1981 Hi Mike, Just want to make sure that we should first merge these changes to Karsten's master branch then we can proceed to merging these to the main CVMix repo, right? |
@qingli411 That would be ideal, as it would update CVMix#88 and I could update my review. Alternatively, I could just merge my branch into |
I think he should merge with squash
fre. 19. jun. 2020 19.06 skrev Qing Li <notifications@github.com>:
… OK. I see. I guess it's perhaps cleaner to merge these changes to
Karsten's branch, then we can have all the CMake relevant discussions and
changes in CVMix#88 <CVMix#88>. @bolding
<https://github.com/bolding> What do you think?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#1 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ACVA42M7AHOWX3U7BR45PYLRXOLI5ANCNFSM4NFR7GSQ>
.
|
I concur.
@bolding if you want me to do a squash merge, could you please merge this PR (without the squash) and then I'll squash-merge your PR? |
I just have merged - is there another one
fre. 19. jun. 2020 19.20 skrev Michael Levy <notifications@github.com>:
… it's perhaps cleaner to merge these changes to Karsten's branch, then we
can have all the CMake relevant discussions and changes in CVMix#88
<CVMix#88>
I concur.
I think he should merge with squash
@bolding <https://github.com/bolding> if you want me to do a squash
merge, could you please merge this PR (without the squash) and then I'll
squash-merge your PR?
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#1 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/ACVA42ODP2TIBDKBATHEYNTRXOM6FANCNFSM4NFR7GSQ>
.
|
@bolding Have you pushed your merged master branch to Github? I didn't see it here... |
@bolding it looks like you merged your |
I must say I'm confused now. When we worked on this a month ago I made updates to my repository including all changes requested. So I don't see why I need for a PR. And I did not notice the PR from @mnlevy1981 until @qingli411 informed me about it yesterday. I then followed the instructions by GitHub and did a merge (including solving a conflict in README - misspelling of installation (no a) - actually surprised why it was there in the first place as I had fixed it a while ago). So - what is the status now? |
Instead of using the GitHub web-interface I now did it via the command line - hopefully it has worked out as you want/expect now. At least git log shows fixes by Michael. Sorry for the confusion - if I'm to blame :-) |
@bolding Thanks! I think now we have all the changes here merged to CVMix#88. I think @mnlevy1981 created this PR because he'd like to add some more changes. Instead of requesting you to make these additional changes, he did that on his side. Then it is cleaner to just add these changes directly to your branch so that they can be merged into the CVMix main repository using the same PR. Otherwise he will have to create another PR in the CVMix main repository. |
I think I was relying on github notifications to let you know this pull request existed, and maybe also didn't explain everything that I thought I had typed out. So apologies for my role in the hold-up. CVMix#88 has been merged, though - thanks so much for the contribution! |
Scripts in each of the subdirectories of
reg_test/
can pass the--cmake
argument, and it will launchcmake
frombld/cmake_bld
and then use the resulting executable (bld/cmake_bld/cvmix_driver
) instead ofbin/cvmix
.Some missing features:
bld/cmake_bld
gfortran
is hard-coded)--cmake
option inCVMix_tools/run_test_suite.sh
But at least it's a way for us to test the
cmake
in Travis.