X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2FCMakeLists.txt;h=b48dc60b235155921aa6a3ba3c563f5c73132220;hb=de5fc413dc579fc61f7e04397efd1dc1087fe3cf;hp=ded39cb18359689a8afc2bcfdfe96d6b57f16edb;hpb=f81c61f9ca9f0c33f35e04f2c1c1ffa11a09db59;p=gdcm.git

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index ded39cb1..b48dc60b 100644
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -150,6 +150,7 @@ IF(GDCM_VTK)
 
   SET(vtkgdcmPython_la_SOURCES
       ${GDCM_SOURCE_DIR}/vtk/vtkGdcmReader.cxx
+      ${GDCM_SOURCE_DIR}/vtk/vtkGdcmWriter.cxx
   )
   SET_SOURCE_FILES_PROPERTIES(vtkGdcmReaderPython.cxx GENERATED)
   
@@ -175,12 +176,12 @@ ENDIF(GDCM_VTK)
 
 # generate a setup.py according to VTK installation
 # put it in subdir in order to not override old one
-
-GET_FILENAME_COMPONENT(VTKPATH ${VTK_DIR}/../../ ABSOLUTE)
-CONFIGURE_FILE(
-    ${GDCM_SOURCE_DIR}/gdcmPython/setup.py.in
-    ${GDCM_BINARY_DIR}/setup.py
-)
+#
+#GET_FILENAME_COMPONENT(VTKPATH ${VTK_DIR}/../../ ABSOLUTE)
+#CONFIGURE_FILE(
+#    ${GDCM_SOURCE_DIR}/gdcmPython/setup.py.in
+#    ${GDCM_BINARY_DIR}/setup.py
+#)
 
 #-----------------------------------------------------------------------------
 # Install stuff:
@@ -206,20 +207,20 @@ FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/__init__.py
     )
 
 FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/core.py
+    "from gdcmVersion import *\n"
     "import gdcm\n"
-    "GDCM_DATA_PATH     =\"${GDCM_DATA_ROOT}\"\n"
-    "GDCM_TEST_DATA_PATH=\"${GDCM_DATA_ROOT}\"\n"
+    "GDCM_DATA_ROOT = \"${GDCM_DATA_ROOT}\"\n"
     )
 
 IF(GDCM_VTK)
   FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/vtk.py
     "import os\n"
+    "from gdcmVersion import *\n"
     "if os.name == 'posix':\n"
     "  from libvtkgdcmPython import *\n"
     "else:\n"
     "  from vtkgdcmPython import *\n"
-    "GDCM_DATA_PATH     =\"${GDCM_DATA_ROOT}\"\n"
-    "GDCM_TEST_DATA_PATH=\"${GDCM_DATA_ROOT}\"\n"
+    "GDCM_DATA_ROOT = \"${GDCM_DATA_ROOT}\"\n"
     )
 ENDIF(GDCM_VTK)