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

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index 3626f30f..b48dc60b 100644
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -15,9 +15,9 @@ INCLUDE_DIRECTORIES(
 IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
 
   # We need to pass that to swig to be sure all modules are generated in the proper dir
-  #SET(CMAKE_SWIG_FLAGS "-outdir ${GDCM_BINARY_DIR}/gdcmPython")
+  SET(CMAKE_SWIG_FLAGS "-outdir ${GDCM_BINARY_DIR}/gdcmPython")
   # Looks like a bug to me in cmake 2.0.x:
-  #SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
+  SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
 
   FIND_PACKAGE(SWIG REQUIRED)
   INCLUDE(${SWIG_USE_FILE})
@@ -207,18 +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_ROOT     =\"${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_ROOT     =\"${GDCM_DATA_ROOT}\"\n"
+    "GDCM_DATA_ROOT = \"${GDCM_DATA_ROOT}\"\n"
     )
 ENDIF(GDCM_VTK)