Skip to content
Browse files

COMP: Fix pathing bug in packaging

For the preferred directory for DCMTK install packages and
DCMT_DIR are not consistent.  THis patch passes the correct pathing
to the bin directory needed for packaging.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21842 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information...
1 parent 1975912 commit 39d967ef0aa38e3635b62726b015ed1e421e7a37 hjohnson committed Mar 26, 2013
Showing with 3 additions and 1 deletion.
  1. +1 −1 CMake/SlicerBlockInstallDCMTKApps.cmake
  2. +2 −0 SuperBuild.cmake
View
2 CMake/SlicerBlockInstallDCMTKApps.cmake
@@ -8,7 +8,7 @@ endif()
set(DCMTK_Apps storescu storescp dcmdump dump2dcm img2dcm dcmdjpeg dcmqrscp)
foreach(dcmtk_App ${DCMTK_Apps})
- install(FILES ${CTK_DCMTK_DIR}/bin/${dcmtk_App}${EXE}
+ install(FILES ${DCMTK_DIR_ROOT}/bin/${dcmtk_App}${EXE}
DESTINATION ${Slicer_INSTALL_BIN_DIR}
PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ
COMPONENT Runtime
View
2 SuperBuild.cmake
@@ -416,6 +416,8 @@ ExternalProject_Add(${proj}
-DjqPlot_DIR:PATH=${jqPlot_DIR}
# LibArchive
-DLibArchive_DIR:PATH=${LibArchive_DIR}
+ # Where to find the installed DCMTK_DIR_ROOT wheere ${DCMTK_DIR_ROOT}/bin contains the executables.
+ -DDCMTK_DIR_ROOT:PATH=${DCMTK_DIR_ROOT}
INSTALL_COMMAND ""
)

0 comments on commit 39d967e

Please sign in to comment.
Something went wrong with that request. Please try again.