X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2FCMakeLists.txt;h=21315eddc4189c41fb7260c888ccbe5427bf27a5;hb=0416947420d9168401c99e7fbf0dca0a081c9175;hp=4c9ebd0e7bf3d955948c3fd988ab8ef37ec44257;hpb=b1140dbfb41d22b5b0790bc8da676f6610cc45b0;p=gdcm.git

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index 4c9ebd0e..21315edd 100644
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -14,16 +14,18 @@ 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")
+  # Looks like a bug to me in cmake 2.0.x:
+  SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
+
   FIND_PACKAGE(SWIG REQUIRED)
   INCLUDE(${SWIG_USE_FILE})
 
-  #INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-  #SET(CMAKE_SWIG_FLAGS "")
-
   #SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES PYTHON ON)
   SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES CPLUSPLUS ON)
   # Setting SWIG_FLAGS to "-includeall" at the following line looks like
-  # a bad idea since swig tries to reculsively include all the referenced
+  # a bad idea since swig tries to recursively include all the referenced
   # files, "including" the C++ <sstream>, <list>, <map>... Of course swig
   # has no way of finding the path to those files (unless it is told by
   # cmake) since they are related to the compiler installation layout.
@@ -34,23 +36,16 @@ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES SWIG_FLAGS "")
   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
-  )
 
+  SET(GDCM_CXX_FLAGS ${CMAKE_SWIG_FLAGS})
+  # Get rid of -Wall / -W / -pedantic if exist
+  SET(CMAKE_CXX_FLAGS "")
+  # I guess I need to put them back on the this file:
+  SET_SOURCE_FILES_PROPERTIES(${GDCM_BINARY_DIR}/gdcmPython/gdcm_wrap.cxx
+                              PROPERTIES COMPILE_FLAGS "")
+#  SET_TARGET_PROPERTIES(${GDCM_BINARY_DIR}/gdcmPython/gdcm_wrap.cxx
+#                        PROPERTIES CMAKE_CXX_FLAGS "-foo")
+  
 ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
 
   # As of 09/10/2003 there was no FindSWIG.cmake
@@ -139,26 +134,6 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
     ${EXE_DIR}/${CMAKE_CFG_INTDIR}/_gdcm${CMAKE_SHARED_LIBRARY_SUFFIX}
     )
 
-  # Remove temporary (lib)pygdcm(.so .dll) library:
-#  ADD_CUSTOM_COMMAND(
-#    TARGET pygdcm
-#    POST_BUILD
-#    COMMAND ${CMAKE_COMMAND}
-#    ARGS -E remove ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}
-#  )
-
-  # where are library stored ?
-#  SET(GDCM_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
-#  ADD_CUSTOM_COMMAND(
-#    TARGET pygdcm
-#    POST_BUILD
-#    COMMAND ${CMAKE_COMMAND}
-#    ARGS -E copy
-#      ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/${MY_LIB_NAME}${CMAKE_SHLIB_SUFFIX}
-#      ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/vtkXY.pvm
-#    TARGET vtkXY
-#  )
-
 ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
 
 
@@ -166,12 +141,16 @@ ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
 # VTK Wrapping
 # 
 IF(GDCM_VTK)
+  # Include the VTK library
+  INCLUDE(${VTK_USE_FILE})
+
   INCLUDE_DIRECTORIES(
     ${GDCM_SOURCE_DIR}/vtk
   )
 
   SET(vtkgdcmPython_la_SOURCES
       ${GDCM_SOURCE_DIR}/vtk/vtkGdcmReader.cxx
+      ${GDCM_SOURCE_DIR}/vtk/vtkGdcmWriter.cxx
   )
   SET_SOURCE_FILES_PROPERTIES(vtkGdcmReaderPython.cxx GENERATED)
   
@@ -195,14 +174,14 @@ IF(GDCM_VTK)
   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
-  
-  GET_FILENAME_COMPONENT(VTKPATH ${VTK_DIR}/../../ ABSOLUTE)
-  CONFIGURE_FILE(
-      ${GDCM_SOURCE_DIR}/gdcmPython/setup.py.in
-      ${GDCM_BINARY_DIR}/setup.py
-  )
+# 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
+#)
 
 #-----------------------------------------------------------------------------
 # Install stuff:
@@ -213,21 +192,33 @@ ENDIF(GDCM_VTK)
 
 # Create a gdcm.pth file:
 
+FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/gdcmVersion.py
+    "gdcmVERSION=\"${GDCM_VERSION}\"\n"
+    )
+
 FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/gdcm.pth
     "gdcmPython\n"
     )
 
 FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/__init__.py
+    "__all__ = [\"core\",\n"
+    "           \"vtk\",\n"
+    "          ]\n"
+    )
+
+FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/core.py
     "import gdcm\n"
+    "GDCM_DATA_ROOT     =\"${GDCM_DATA_ROOT}\"\n"
     )
 
 IF(GDCM_VTK)
-  FILE(APPEND ${GDCM_BINARY_DIR}/gdcmPython/__init__.py
+  FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/vtk.py
     "import os\n"
     "if os.name == 'posix':\n"
     "  from libvtkgdcmPython import *\n"
     "else:\n"
     "  from vtkgdcmPython import *\n"
+    "GDCM_DATA_ROOT     =\"${GDCM_DATA_ROOT}\"\n"
     )
 ENDIF(GDCM_VTK)