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

Submodules and cmake build tools instead of Makefiles #52

Merged
merged 69 commits into from Dec 7, 2019
Merged

Submodules and cmake build tools instead of Makefiles #52

merged 69 commits into from Dec 7, 2019

Conversation

fonsocarre
Copy link
Collaborator

Everyone, (specially @rafmudaf),
This pull request contains a lot of changes about how SHARPy is built. In a nutshell:

  • cmake for SHARPy, UVLM and xbeam
  • git submodules for xbeam and UVLM keep the versions coherent
  • no more generic makefiles. Just cmake .
  • Installation instructions have been updated accordingly.
  • No pip dependency for building the python environment.
  • Dockerfile and travis CI tests updated accordingly.

This fixes ImperialCollegeLondon/UVLM#4, fixes #46, and fixes #47, also includes #44.

Let me know if you think something can be done better.

ngoiz and others added 30 commits November 27, 2019 09:38
@ngoiz
Updated installation instructions
5781ba2
@ngoiz
A few more changes to install instructions
b3d3584
@rafmudaf
Bug fixes in installation docs
904cbd0
@ngoiz
Merge branch 'dev_doc' into develop
dea41eb
@ngoiz
Merge pull request #45 from rafmudaf/develop
ce4022e 
Bug fixes in installation docs
@ngoiz
UVLM added as a git-submodule
55355dd
@ngoiz
Changed UVLM branch and relative directory
334d127
@ngoiz
Removed UVLM submodule
c538454
@ngoiz
Changed directory of the UVLM to lib
a451128
@ngoiz
Added xbeam as a submodule
7809a4c
@ngoiz
added xbeam and modified route to libs
510dec9
@ngoiz
Update travis for submodules
89dbd35
@ngoiz
Update travis directory
178fce3
@ngoiz
Updated Dockr with submodule instructions
189055f
@ngoiz
Basic SHARPy installation script
5cadd9b
@ngoiz
Updated .gitmodules
f120300
@ngoiz
Merge remote-tracking branch 'origin/dev_doc' into dev_submodules
8e0b2b5
@ngoiz
Install instructions include new git submodules + Git branching model
6633d75
@ngoiz
Fixed typos in install instructions + changed geradin test to .sharpy
a275eaa
@ngoiz
Merge branch 'fix_test_tear_down' into dev_submodules
5e1940a
@ngoiz
Added cd to move into sharpy before initialising submodules
019f767
@fonsocarre
Added CMakeLists for UVLM and xbeam compilation.
c983aa8
@fonsocarre
CMakeLists added despite the gitignore
f374c9b
@fonsocarre
gitignore again lib/
4e5674e
@fonsocarre
Git submodule commands automatic on cmake call
c4125ed
@fonsocarre
travis updated for new cmake
489c17f
@fonsocarre
Travis was stuck in the build folder. Fixed
8263bb1
@fonsocarre
Updated env for MacOS, still needs to have more things added
73e428f
@fonsocarre
Temporary commit
96dc27f
@fonsocarre
Merge branch 'dev_cmake' of https://github.com/imperialcollegelondon/…
4393943 
…sharpy into dev_cmake
@fonsocarre fonsocarre requested a review from ngoiz December 6, 2019 19:29
@fonsocarre fonsocarre added this to In progress in Updated distribution methods via automation Dec 6, 2019
ngoiz
ngoiz reviewed Dec 7, 2019
View reviewed changes
Copy link
Collaborator

@ngoiz ngoiz left a comment

Choose a reason for hiding this comment

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

Just to confirm that cmakeshould only be in the _minimalenvironment rather than all of them?

@fonsocarre
Copy link
Collaborator Author

Of course, you're right @ngoiz, it should be in all of them. I'm on it.

@fonsocarre
Copy link
Collaborator Author

These last coupled of commits include cmake for all the environments, including macOS, and I have also removed any trace of pip. All is installed through Anaconda now.

@ngoiz
Updated installation instructions
39c7deb 
Removed CMake from requirements since it is included in the environment
ngoiz
ngoiz approved these changes Dec 7, 2019
View reviewed changes
Copy link
Collaborator

@ngoiz ngoiz left a comment

Choose a reason for hiding this comment

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

Thanks! I have just removed the explicit requirement for CMake from the installation requirements since it is all provided in the conda environment

@ngoiz ngoiz merged commit 8638e99 into master Dec 7, 2019
Updated distribution methods automation moved this from In progress to Completed Dec 7, 2019
@ngoiz ngoiz deleted the dev_submodules branch December 7, 2019 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ngoiz ngoiz ngoiz approved these changes

Assignees
No one assigned
Labels
Documentation enhancement
Projects
No open projects
Updated distribution methods
  
Completed
Milestone
No milestone
3 participants
@fonsocarre @ngoiz @rafmudaf