Permalink
Browse files

ENH: Add ITKv4 PETStandardUptakeValueComputation

Extracting DICOM header values needed updating
for compatibility with API in ITKv4

git-svn-id: http://svn.slicer.org/Slicer4/trunk@21442 3bd1e089-480b-0410-8dfb-8563597acbee
  • Loading branch information...
hjohnson
hjohnson committed Nov 19, 2012
1 parent b9d4f46 commit 1ab763f08ef34c4d42010925fd70cbd4ed06dbf2
View
@@ -49,9 +49,8 @@ set(cli_modules
)
if(Slicer_BUILD_DICOM_SUPPORT)
- list(APPEND cli_modules
- CreateDICOMSeries
- )
+ list(APPEND cli_modules CreateDICOMSeries)
+ list(APPEND cli_modules PETStandardUptakeValueComputation)
endif()
if(Slicer_BUILD_LEGACY_CLI)
@@ -83,7 +82,6 @@ endif()
if("${ITK_VERSION_MAJOR}" LESS 4)
if(Slicer_BUILD_DICOM_SUPPORT)
list(APPEND cli_modules DicomToNrrdConverter)
- list(APPEND cli_modules PETStandardUptakeValueComputation)
endif()
endif()
@@ -170,3 +168,7 @@ if(Slicer_BUILD_BRAINSTOOLS)
)
endif()
+if(Slicer_BUILD_DWIConvert)
+ message("DCMTK_DIR = ${DCMTK_DIR}")
+ add_subdirectory(${DWIConvert_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/DWIConvert)
+endif()
@@ -1,13 +1,17 @@
+find_package(DCMTK REQUIRED)
#-----------------------------------------------------------------------------
set(MODULE_NAME PETStandardUptakeValueComputation) # Do not use 'project()'
#-----------------------------------------------------------------------------
SEMMacroBuildCLI(
NAME ${MODULE_NAME}
+ ADDITIONAL_SRCS itkDCMTKFileReader.cxx
LOGO_HEADER ${Slicer_SOURCE_DIR}/Resources/NAMICLogo.h
# LOGO_HEADER ${Slicer_SOURCE_DIR}/Resources/CTSCLogo.h
- TARGET_LIBRARIES vtkITK ModuleDescriptionParser MRMLCore SlicerBaseLogic SlicerBaseCLI ITKIO
+ TARGET_LIBRARIES vtkITK ModuleDescriptionParser
+ MRMLCore SlicerBaseLogic SlicerBaseCLI ${ITK_LIBRARIES}
+ ${DCMTK_LIBRARIES}
INCLUDE_DIRECTORIES
${vtkITK_INCLUDE_DIRS}
${MRMLCore_INCLUDE_DIRS}
Oops, something went wrong.

0 comments on commit 1ab763f

Please sign in to comment.