Requires cython
https://github.com/CCPPETMR/Hackathon-SIRF-SuperBuild/pull/1
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.
@KrisThielemans requested changes on this pull request.
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)
In SuperBuild/External_CCPi-Framework.cmake:
> +set(${proj}_BINARY_DIR "${SUPERBUILD_WORK_DIR}/builds/${proj}/build" ) +set(${proj}_DOWNLOAD_DIR "${SUPERBUILD_WORK_DIR}/downloads/${proj}" ) +set(${proj}_STAMP_DIR "${SUPERBUILD_WORK_DIR}/builds/${proj}/stamp" ) +set(${proj}_TMP_DIR "${SUPERBUILD_WORK_DIR}/builds/${proj}/tmp" ) + +if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalProjName}}" ) ) + message(STATUS "${__indent}Adding project ${proj}") + + ### --- Project specific additions here + set(libcilreg_Install_Dir ${SUPERBUILD_INSTALL_DIR}) + + #message(STATUS "HDF5_ROOT in External_SIRF: " ${HDF5_ROOT}) + 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)
not sure why an env variable. and shouldn't it be in version_config.cmake ? also some hard-wired 0.10.1 below
In SuperBuild/External_CCPi-Framework.cmake:
> @@ -0,0 +1,129 @@ +#======================================================================== +# Author: Benjamin A Thomas +# Author: Kris Thielemans +# Author: Edoardo Pasca +# Copyright 2017 University College London +# Copyright 2017 STFC
dates
> @@ -150,6 +156,13 @@ else() set(DEFAULT_ACE_URL https://github.com/paskino/libace-conda) set(DEFAULT_ACE_TAG origin/master) + + # CCPi CIL + set(DEFAULT_CCPi-Framework_URL https://github.com/vais-ral/CCPi-Framework.git) + set(DEFAULT_CCPi-Framework_TAG origin/master)
really master
?
@paskino pushed 2 commits.
—
You are receiving this because you are subscribed to this thread.
@paskino commented on this pull request.
In SuperBuild/External_CCPi-Framework.cmake:
> +set(${proj}_BINARY_DIR "${SUPERBUILD_WORK_DIR}/builds/${proj}/build" ) +set(${proj}_DOWNLOAD_DIR "${SUPERBUILD_WORK_DIR}/downloads/${proj}" ) +set(${proj}_STAMP_DIR "${SUPERBUILD_WORK_DIR}/builds/${proj}/stamp" ) +set(${proj}_TMP_DIR "${SUPERBUILD_WORK_DIR}/builds/${proj}/tmp" ) + +if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalProjName}}" ) ) + message(STATUS "${__indent}Adding project ${proj}") + + ### --- Project specific additions here + set(libcilreg_Install_Dir ${SUPERBUILD_INSTALL_DIR}) + + #message(STATUS "HDF5_ROOT in External_SIRF: " ${HDF5_ROOT}) + 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)
This is for a silly reason on the CCPi package. It should be removed from it, but it's needed for the time being.
@paskino commented on this pull request.
> @@ -150,6 +156,13 @@ else() set(DEFAULT_ACE_URL https://github.com/paskino/libace-conda) set(DEFAULT_ACE_TAG origin/master) + + # CCPi CIL + set(DEFAULT_CCPi-Framework_URL https://github.com/vais-ral/CCPi-Framework.git) + set(DEFAULT_CCPi-Framework_TAG origin/master)
I'm removing it in favour of a specific tag.
This gets superseded by CCPPETMR/SIRF-SuperBuild#154
Refer to https://github.com/CCPPETMR/SIRF/projects/3