Permalink
Browse files

COMP: Clean up issues with ITK/DCMTK/CTK configuration

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21841 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information...
1 parent ab4bf68 commit 197591273a242edb40d7518c4e0911675bd34178 hjohnson committed Mar 26, 2013
Showing with 8 additions and 5 deletions.
  1. +1 −1 SuperBuild/External_CTK.cmake
  2. +6 −3 SuperBuild/External_DCMTK.cmake
  3. +1 −1 SuperBuild/External_ITKv4.cmake
View
2 SuperBuild/External_CTK.cmake
@@ -56,7 +56,7 @@ if(NOT DEFINED CTK_DIR)
if(Slicer_BUILD_DICOM_SUPPORT)
list(APPEND optional_ep_args
- -DDCMTK_DIR:PATH=${DCMTK_DIR}
+ -DDCMTK_DIR:PATH=${DCMTK_DIR_ROOT}
)
endif()
View
9 SuperBuild/External_DCMTK.cmake
@@ -30,7 +30,7 @@ if(NOT DEFINED DCMTK_DIR)
endif()
set(${proj}_REPOSITORY ${git_protocol}://github.com/InsightSoftwareConsortium/DCMTK.git)
- set(${proj}_GIT_TAG "257e800c42f40ff3207a9242fa225c850c56dd07")
+ set(${proj}_GIT_TAG "c14dd383cfedd2f2c0daf9adf2b50214712821e6")
ExternalProject_Add(${proj}
GIT_REPOSITORY ${DCMTK_REPOSITORY}
@@ -63,8 +63,11 @@ if(NOT DEFINED DCMTK_DIR)
DEPENDS
${DCMTK_DEPENDENCIES}
)
-
- set(DCMTK_DIR ${CMAKE_BINARY_DIR}/${proj}-install)
+ #
+ # Until and unless CTK stops using its own FindDCMTK.cmake, it will have
+ # to employ a different DCMTK_DIR variable than ITK.
+ set(DCMTK_DIR_ROOT ${CMAKE_BINARY_DIR}/${proj}-install )
+ set(DCMTK_DIR ${DCMTK_DIR_ROOT}/lib/cmake/dcmtk)
else()
# The project is provided with DCMTK_DIR, nevertheless since other project may depend on DCMTK_DIR,
# let's add an 'empty' one
View
2 SuperBuild/External_ITKv4.cmake
@@ -37,7 +37,7 @@ if(NOT DEFINED ITK_DIR)
if(Slicer_BUILD_DICOM_SUPPORT)
set(ITKv4_DCMTK_ARGS
-DITK_USE_SYSTEM_DCMTK:BOOL=ON
- -DDCMTK_DIR:PATH=${DCMTK_DIR}/share/dcmtk
+ -DDCMTK_DIR:PATH=${DCMTK_DIR}
-DModule_ITKIODCMTK:BOOL=ON
)
endif()

0 comments on commit 1975912

Please sign in to comment.