Itk #68
Itk #68
Conversation
SuperBuild/External_ITK.cmake
Outdated
| -DCMAKE_LIBRARY_PATH=${SUPERBUILD_INSTALL_DIR}/lib | ||
| -DCMAKE_INCLUDE_PATH=${SUPERBUILD_INSTALL_DIR} | ||
| -DCMAKE_INSTALL_PREFIX=${${proj}_Install_Dir} | ||
| -DBUILD_SHARED_LIBS=true |
There was a problem hiding this comment.
more standard to use ON than true. same for OFF.
SuperBuild/External_ITK.cmake
Outdated
| -DCMAKE_INCLUDE_PATH=${SUPERBUILD_INSTALL_DIR} | ||
| -DCMAKE_INSTALL_PREFIX=${${proj}_Install_Dir} | ||
| -DBUILD_SHARED_LIBS=true | ||
| -DCMAKE_BUILD_TYPE=release |
There was a problem hiding this comment.
that would have to be Release but in fact I don't think we should force this. It should be handled by EXTERNAL_PROJECT_BUILD_TYPE already. So delete this line.
SuperBuild/External_ITK.cmake
Outdated
| DEPENDS ${${proj}_DEPENDENCIES} | ||
| ) | ||
|
|
||
| set(${proj}_ROOT ${${proj}_SOURCE_DIR}) |
There was a problem hiding this comment.
ITK_ROOT is not used. The variable for ITK is ITK_DIR as it uses ITKConfig.cmake (as opposed to a FindITK.cmake module). I wouldn't really know how to set ITK_DIR though. It's likely going to be OS dependent. Possibly @bathomas knows how to do this. But luckily it seems we don't need this (as it seems to be found because of CMAKE_INSTALL_PREFIX).
See also #70 which contains a link to the Slicer SuperBuild file for ITK.
SuperBuild/External_STIR.cmake
Outdated
| if (USE_ITK AND USE_SYSTEM_ITK) | ||
| set(STIR_CMAKE_ARGS | ||
| ${STIR_CMAKE_ARGS} | ||
| -DDISABLE_ITK=false |
There was a problem hiding this comment.
remove this line. STIR will by default look for it, so no need to disable the disable...
SuperBuild/External_STIR.cmake
Outdated
| # If !USE_SYSTEM_ITK, ITK_DIR will get set during the installation of ITK | ||
| -DITK_DIR=${ITK_DIR} | ||
| ) | ||
| # ITK not required, so disable |
There was a problem hiding this comment.
I guess move the comment inside the else()
version_config.cmake
Outdated
| @@ -73,6 +73,10 @@ option(DEVEL_BUILD "Use current versions of major packages" OFF) | |||
| set(googletest_URL https://github.com/google/googletest ) | |||
| set(googletest_TAG release-1.8.0) | |||
|
|
|||
| ## ITK | |||
| set(ITK_URL git://itk.org/ITK.git) | |||
There was a problem hiding this comment.
we're using https links for all the others. Not 100% sure what the impact of using git is. best to be uniform I guess.
2. `CMAKE_BUILD_TYPE=` `Release` -> `${EXTERNAL_PROJECT_BUILD_TYPE}`
3. `set(${proj}_ROOT)` deleted
4. `-DDISABLE_ITK=ON` deleted for `!USE_ITK`
5. `git://itk` -> `https://itk`
remove env variables and increase pointer size
Optionally build STIR with ITK