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

Add CONDA_BUILD flag. #92

Merged
merged 2 commits into from
Sep 23, 2016
Merged

Add CONDA_BUILD flag. #92

merged 2 commits into from
Sep 23, 2016

Conversation

roryk
Copy link
Contributor

@roryk roryk commented Sep 15, 2016

Hi Rob,

I took a shot at adding a CONDA_BUILD flag to make it work with conda builds rather than editing the CMakeLists.txt with sed in the build script. I tested it and it seems to work, but it could use a review by someone who has used cmake before.

It might be that editing with sed is a cleaner solution, getting the flags in the right place made the CMakeLists.txt file a little ugly. Totally happy to do either solution.

@rob-p rob-p changed the base branch from master to develop September 23, 2016 02:22
@rob-p rob-p changed the base branch from develop to master September 23, 2016 02:32
@rob-p rob-p changed the base branch from master to develop September 23, 2016 02:32
@rob-p rob-p merged commit ccf5420 into COMBINE-lab:develop Sep 23, 2016
@rob-p
Copy link
Collaborator

rob-p commented Sep 23, 2016

Sorry it took me so long to get around to this. Thanks for the PR! I merged into develop instead of master since I'm working on a new release.

@roryk
Copy link
Contributor Author

roryk commented Sep 23, 2016

Sweet, thanks Rob!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants