upgrades for 4DSplitter

[gdcm.git] / gdcmPython / demo / CMakeLists.txt

diff --git a/gdcmPython/demo/CMakeLists.txt b/gdcmPython/demo/CMakeLists.txt
index 23320d75f633ce23b61deed51f25438448553cc8..e4a49877c5b3b192baac4202756cb1a1d76eb4a4 100644 (file)
--- a/gdcmPython/demo/CMakeLists.txt
+++ b/gdcmPython/demo/CMakeLists.txt
@@ -3,8 +3,9 @@
 #-----------------------------------------------------------------------------
 # DOH! python is not found by default
 FIND_PROGRAM(PYTHON_EXECUTABLE
-    NAMES python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
+    NAMES python python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
     PATHS
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]    
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]
@@ -25,6 +26,9 @@ IF(PYTHON_EXECUTABLE)
   ADD_TEST(Python-PrintDicomDir ${PYTHON_EXECUTABLE}
     ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDicomDir.py
     )
+  ADD_TEST(Python-MakeDicomDir ${PYTHON_EXECUTABLE}
+    ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDicomDir.py
+    )
 ELSE(PYTHON_EXECUTABLE)
   MESSAGE(FATAL_ERROR "You requested testing for python, but python was not
     found")
@@ -48,11 +52,22 @@ CONFIGURE_FILE(
     ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDicomDir.py
 )
 
+CONFIGURE_FILE(
+    ${GDCM_SOURCE_DIR}/gdcmPython/demo/MakeDicomDir.py.in
+    ${GDCM_BINARY_DIR}/gdcmPython/demo/MakeDicomDir.py
+)
+
 CONFIGURE_FILE(
     ${GDCM_SOURCE_DIR}/gdcmPython/demo/PrintDict.py.in
     ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDict.py
 )
 
+INSTALL_FILES(/lib/gdcm/gdcmPython/demo FILES 
+   "${GDCM_BINARY_DIR}/gdcmPython/demo/PrintFile.py"
+   "${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDicomDir.py"
+   "${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDict.py"
+)
+
 #-----------------------------------------------------------------------------
 # Same but for VTK
 IF(GDCM_VTK)
@@ -74,8 +89,13 @@ IF(GDCM_VTK)
       ${GDCM_SOURCE_DIR}/gdcmPython/demo/vtkGdcmWriter.py.in
       ${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmWriter.py
   )
+
+  INSTALL_FILES(/lib/gdcm/gdcmPython/demo FILES 
+     "${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmReader.py"
+     "${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmWriter.py"
+  )
+
 ENDIF(GDCM_VTK)
 
 #-----------------------------------------------------------------------------
-INSTALL_FILES(/lib/gdcm/gdcmPython/demo "\\.py$")