X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2Fdemo%2FCMakeLists.txt;h=eaae23a84fd9853c42c3f0c0aa52322c8a310768;hb=6fd1f2a021e3dc5c564ad4b60117ae676a93c1b7;hp=66da5850535758bfe3297ece52a6a01bcab87334;hpb=d24a4150db8e1c04392eece82119098276713d46;p=gdcm.git

diff --git a/gdcmPython/demo/CMakeLists.txt b/gdcmPython/demo/CMakeLists.txt
index 66da5850..eaae23a8 100644
--- a/gdcmPython/demo/CMakeLists.txt
+++ b/gdcmPython/demo/CMakeLists.txt
@@ -19,12 +19,15 @@ IF(PYTHON_EXECUTABLE)
   ADD_TEST(Python-PrintDict ${PYTHON_EXECUTABLE}
     ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDict.py
     )
-  ADD_TEST(Python-PrintHeader ${PYTHON_EXECUTABLE}
-    ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintHeader.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
     )
+  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")
@@ -34,8 +37,13 @@ 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.in
-    ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintHeader.py
+    ${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(
@@ -43,11 +51,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)
@@ -69,4 +88,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)
+
+#-----------------------------------------------------------------------------
+