X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2FCMakeLists.txt;h=21315eddc4189c41fb7260c888ccbe5427bf27a5;hb=0408b1aa8aaf0d1e17391984490ad2bbe89a922b;hp=b6f7322beb1d832fd486b3495a567a94bf8556af;hpb=ed96b11a44a8e6ee7c3d091d069a04a683cdf2f6;p=gdcm.git

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index b6f7322b..21315edd 100644
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -25,7 +25,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)
   # 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.
@@ -134,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)   
 
 
@@ -170,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)
   
@@ -195,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:
@@ -227,8 +208,7 @@ FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/__init__.py
 
 FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/core.py
     "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)
@@ -238,19 +218,10 @@ IF(GDCM_VTK)
     "  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)
 
-#-----------------------------------------------------------------------------
-# Copy the testSuite.py file
-CONFIGURE_FILE(
-    ${GDCM_SOURCE_DIR}/gdcmPython/testSuite.py
-    ${GDCM_BINARY_DIR}/gdcmPython/testSuite.py
-    COPYONLY
-)
-
 #-----------------------------------------------------------------------------
 # Add test from demo subdir: