X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fdemo%2FCMakeLists.txt;h=f50976ab9329b73bfbc16bd294ca0d3bc3e0bd09;hb=f6746d3627f7272556973738450a89b3f92f2e9a;hp=93c5dd15f3758fd4c99da3ce7e2c69cef060dc82;hpb=ed96b11a44a8e6ee7c3d091d069a04a683cdf2f6;p=gdcm.git

diff --git a/gdcmPython/demo/CMakeLists.txt b/gdcmPython/demo/CMakeLists.txt
index 93c5dd15..f50976ab 100644
--- a/gdcmPython/demo/CMakeLists.txt
+++ b/gdcmPython/demo/CMakeLists.txt
@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------------------
 # DOH! python is not found by default
 FIND_PROGRAM(PYTHON_EXECUTABLE
-    NAMES python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python
+    NAMES python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
     PATHS
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
@@ -16,8 +16,14 @@ FIND_PROGRAM(PYTHON_EXECUTABLE
 MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
 
 IF(PYTHON_EXECUTABLE)
-  ADD_TEST(Python-PrintHeader ${PYTHON_EXECUTABLE}
-    ${GDCM_SOURCE_DIR}/gdcmPython/demo/PrintHeader.py
+  ADD_TEST(Python-PrintDict ${PYTHON_EXECUTABLE}
+    ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDict.py
+    )
+  ADD_TEST(Python-PrintFile ${PYTHON_EXECUTABLE}
+    ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintFile.py
+    )
+  ADD_TEST(Python-PrintDicomDir ${PYTHON_EXECUTABLE}
+    ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDicomDir.py
     )
 ELSE(PYTHON_EXECUTABLE)
   MESSAGE(FATAL_ERROR "You requested testing for python, but python was not
@@ -28,8 +34,44 @@ ENDIF(PYTHON_EXECUTABLE)
 # Copy all the demo directory content to the cmake bin 
 # Without it, tests can't be launched
 CONFIGURE_FILE(
-    ${GDCM_SOURCE_DIR}/gdcmPython/demo/PrintHeader.py
-    ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintHeader.py
-    COPYONLY
+    ${GDCM_SOURCE_DIR}/gdcmPython/demo/gdcmConfigDemo.py.in
+    ${GDCM_BINARY_DIR}/gdcmPython/demo/gdcmConfigDemo.py
+)
+
+CONFIGURE_FILE(
+    ${GDCM_SOURCE_DIR}/gdcmPython/demo/PrintFile.py.in
+    ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintFile.py
+)
+
+CONFIGURE_FILE(
+    ${GDCM_SOURCE_DIR}/gdcmPython/demo/PrintDicomDir.py.in
+    ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDicomDir.py
 )
 
+CONFIGURE_FILE(
+    ${GDCM_SOURCE_DIR}/gdcmPython/demo/PrintDict.py.in
+    ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDict.py
+)
+
+#-----------------------------------------------------------------------------
+# Same but for VTK
+IF(GDCM_VTK)
+  IF(PYTHON_EXECUTABLE)
+    ADD_TEST(Python-VTK-Reader ${PYTHON_EXECUTABLE}
+        ${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmReader.py
+    )
+    ADD_TEST(Python-VTK-Writer ${PYTHON_EXECUTABLE}
+        ${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmWriter.py
+    )
+  ENDIF(PYTHON_EXECUTABLE)
+
+  CONFIGURE_FILE(
+      ${GDCM_SOURCE_DIR}/gdcmPython/demo/vtkGdcmReader.py.in
+      ${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmReader.py
+  )
+
+  CONFIGURE_FILE(
+      ${GDCM_SOURCE_DIR}/gdcmPython/demo/vtkGdcmWriter.py.in
+      ${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmWriter.py
+  )
+ENDIF(GDCM_VTK)