* Test/PrintAllDocument.cxx: looping on files is now effective. It used to

[gdcm.git] / gdcmPython / CMakeLists.txt

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index 1b713bd019d63a03c465dfe4633e049d988224fe..2b094c63d663b250120ba7b9335f667075e676fd 100644 (file)
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -23,13 +23,25 @@ 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" )
   #MESSAGE(FATAL_ERROR ${swig_generated_file_fullname})
   #MESSAGE(FATAL_ERROR ${swig_source_file_fullname})
 
+  # Swig creates a gdcm.py file put it in the right place, if only cmake
+  # was able to do stuff properly ...
+  ADD_CUSTOM_TARGET( CMAKE_S____ ALL)
+  ADD_CUSTOM_COMMAND(
+    TARGET CMAKE_S____
+    POST_BUILD
+    COMMAND ${CMAKE_COMMAND}
+    ARGS -E copy 
+      ${GDCM_BINARY_DIR}/gdcmPython/gdcm.py
+      ${GDCM_BINARY_DIR}/bin/gdcm.py
+  )
+
 ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
 
   # As of 09/10/2003 there was no FindSWIG.cmake
@@ -75,7 +87,7 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   # Then create the gdcm.py = gdcmVersion.py + gdcm.py (swig) file:
   FILE(WRITE ${GDCM_BINARY_DIR}/bin/gdcmVersion.py
     "import os\n"
-    "gdcmVERSION=\"${GDCM_VERSION_FULL}\"\n"
+    "gdcmVERSION=\"${GDCM_VERSION}\"\n"
     "GDCM_DATA_PATH=\"${GDCM_DATA_ROOT}\"\n\n"
     ${SWIG_GDCM_PY}
     )
@@ -166,14 +178,14 @@ 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)
-  
+ENDIF(GDCM_VTK)
+
   # generate a setup.py according to VTK installation 
   # put it in subdir in order to not override old one
   
@@ -182,7 +194,6 @@ IF(GDCM_VTK)
       ${GDCM_SOURCE_DIR}/gdcmPython/setup.py.in
       ${GDCM_BINARY_DIR}/setup.py
   )
-ENDIF(GDCM_VTK)
 
 #-----------------------------------------------------------------------------
 # Install stuff:
@@ -194,12 +205,22 @@ 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: