From: malaterre <malaterre>
Date: Fri, 4 Jun 2004 03:21:44 +0000 (+0000)
Subject: BUG: Broke cmake183 by mistake, also enhance the init.py script
X-Git-Tag: Version0.5.bp~155
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=e0522a941acba1064185ac1f723ed43ff3c3a360;p=gdcm.git

BUG: Broke cmake183 by mistake, also enhance the init.py script
---

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index 1b713bd0..38845414 100644
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -23,7 +23,7 @@ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   #SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES PYTHON ON)
   SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES CPLUSPLUS ON)
   SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES SWIG_FLAGS "-includeall")
-  SWIG_ADD_MODULE(gdcm python gdcm.i )  #gdcm_wrap.cxx
+  SWIG_ADD_MODULE(gdcm python gdcm.i)  #gdcm_wrap.cxx
   SWIG_LINK_LIBRARIES(gdcm gdcm ${PYTHON_LIBRARIES})
   
   #SWIG_GET_EXTRA_OUTPUT_FILES(python foobar "/usr/" "gdcm" )
@@ -166,10 +166,9 @@ IF(GDCM_VTK)
     # set the libraries to link against
     #SET_TARGET_PROPERTIES(${foobar} PROPERTIES PREFIX "")
 
-    GET_TARGET_PROPERTY(swig_gdcm_fullpath "${SWIG_MODULE_gdcm_REAL_NAME}" LOCATION)
+    #GET_TARGET_PROPERTY(swig_gdcm_fullpath "${SWIG_MODULE_gdcm_REAL_NAME}" LOCATION)
     TARGET_LINK_LIBRARIES (vtkgdcmPython
-                           vtkgdcm        # ???
-                           #`${swig_gdcm_fullpath}`  #Does not work
+                           vtkgdcm
                            vtkCommonPython
                            vtkIOPython)
   ENDIF (GDCM_WRAP_PYTHON)
@@ -194,13 +193,23 @@ ENDIF(GDCM_VTK)
 # Create a gdcm.pth file:
 
 FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/gdcm.pth
-    "gdcmPython"
+    "gdcmPython\n"
     )
 
 FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/__init__.py
-    "import gdcm"
+    "import gdcm\n"
     )
 
+IF(GDCM_VTK)
+  FILE(APPEND ${GDCM_BINARY_DIR}/gdcmPython/__init__.py
+    "import os\n"
+    "if os.name == 'posix':\n"
+    "  from libvtkgdcmPython import *\n"
+    "else:\n"
+    "  from vtkgdcmPython import *\n"
+    )
+ENDIF(GDCM_VTK)
+
 #-----------------------------------------------------------------------------
 # Add test from demo subdir: