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

Add CCPi CIL to SuperBuild #1

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add CCPi CIL to SuperBuild #1

wants to merge 9 commits into from

Conversation

paskino
Copy link
Contributor

@paskino paskino commented Jul 29, 2018

Requires cython

This was referenced Jul 29, 2018
Open
Closed
KrisThielemans
KrisThielemans requested changes Jul 30, 2018
View reviewed changes
Copy link
Member

@KrisThielemans KrisThielemans left a comment

Choose a reason for hiding this comment

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

regularisers config will break on Windows. just disable I guess.

This PR should go to the main repo, no tthe hackathon one.

some commits here and changes that shouldn't be here (e.g. the glog change)

SuperBuild/External_CCPi-Framework.cmake
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${SUPERBUILD_INSTALL_DIR})
set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} ${SUPERBUILD_INSTALL_DIR})

set(ENV{CIL_VERSION} 0.10.1)
Copy link
Member

Choose a reason for hiding this comment

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

not sure why an env variable. and shouldn't it be in version_config.cmake ? also some hard-wired 0.10.1 below

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is for a silly reason on the CCPi package. It should be removed from it, but it's needed for the time being.

SuperBuild/External_CCPi-Framework.cmake
# Author: Kris Thielemans
# Author: Edoardo Pasca
# Copyright 2017 University College London
# Copyright 2017 STFC
Copy link
Member

Choose a reason for hiding this comment

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

dates

version_config.cmake

# CCPi CIL
set(DEFAULT_CCPi-Framework_URL https://github.com/vais-ral/CCPi-Framework.git)
set(DEFAULT_CCPi-Framework_TAG origin/master)
Copy link
Member

Choose a reason for hiding this comment

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

really master?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm removing it in favour of a specific tag.

@paskino paskino mentioned this pull request Nov 15, 2018
Merged
@paskino
Copy link
Contributor Author

paskino commented Nov 16, 2018

This gets superseded by SyneRBI/SIRF-SuperBuild#154

Refer to https://github.com/CCPPETMR/SIRF/projects/3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@KrisThielemans KrisThielemans KrisThielemans requested changes

@bathomas bathomas Awaiting requested review from bathomas

Requested changes must be addressed to merge this pull request.

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

Successfully merging this pull request may close these issues.
3 participants
@paskino @KrisThielemans @ashgillman