* Fix the unix installation for the python part

   -- BeNours

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48e2e508f2f503cd9698575b1b5e1f027f8a4bff..382fb8d12117196c56c3daac87bf46a026d5f327 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,7 +197,7 @@ OPTION(GDCM_FORCE_BIGENDIAN_EMULATION "Force Big Endian Emulation. Do use if you
 CONFIGURE_FILE(${GDCM_SOURCE_DIR}/gdcmConfigure.h.in
                ${GDCM_BINARY_DIR}/gdcmConfigure.h @ONLY IMMEDIATE)
 
-INSTALL_FILES(/include .h gdcmConfigure.h)
+INSTALL_FILES(/include/gdcm .h gdcmConfigure.h)
 INSTALL_FILES(/lib .cmake GDCMBuildSettings  GDCMConfig  GDCMLibraryDepends)
 
 #-----------------------------------------------------------------------------

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index e1209af0aecda5eb4a6d89403faeadf8eef34883..ba6957394782755a5969540ee17088996ffde128 100644 (file)
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -142,9 +142,16 @@ IF(UNIX)
   ) 
   STRING(REGEX REPLACE "/usr" "" PYTHON_DIR ${PYTHON_DIR})
 
-  INSTALL_FILES(${PYTHON_DIR}/site-packages "gdcmPython.pth")
-  INSTALL_FILES(/lib/gdcm/gdcmPython "\\.py$")
-  INSTALL_FILES(/lib/gdcm/gdcmPython FILES "gdcm.py")
+  INSTALL_FILES(${PYTHON_DIR}/site-packages FILES 
+    "${GDCM_BINARY_DIR}/gdcmPython/gdcmPython.pth"
+  )
+  INSTALL_FILES(/lib/gdcm/gdcmPython FILES 
+    "gdcm.py" 
+    "__init__.py" 
+    "gdcmVersion.py" 
+    "core.py" 
+    "vtk.py"
+  )
 ENDIF(UNIX)
 
 #-----------------------------------------------------------------------------

diff --git a/gdcmPython/demo/CMakeLists.txt b/gdcmPython/demo/CMakeLists.txt
index 23320d75f633ce23b61deed51f25438448553cc8..4c76a3bae078854150d723300c8a8789d1eee888 100644 (file)
--- a/gdcmPython/demo/CMakeLists.txt
+++ b/gdcmPython/demo/CMakeLists.txt
@@ -53,6 +53,12 @@ CONFIGURE_FILE(
     ${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDict.py
 )
 
+INSTALL_FILES(/lib/gdcm/gdcmPython/demo FILES 
+   "${GDCM_BINARY_DIR}/gdcmPython/demo/PrintFile.py"
+   "${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDicomDir.py"
+   "${GDCM_BINARY_DIR}/gdcmPython/demo/PrintDict.py"
+)
+
 #-----------------------------------------------------------------------------
 # Same but for VTK
 IF(GDCM_VTK)
@@ -74,8 +80,13 @@ IF(GDCM_VTK)
       ${GDCM_SOURCE_DIR}/gdcmPython/demo/vtkGdcmWriter.py.in
       ${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmWriter.py
   )
+
+  INSTALL_FILES(/lib/gdcm/gdcmPython/demo FILES 
+     "${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmReader.py"
+     "${GDCM_BINARY_DIR}/gdcmPython/demo/vtkGdcmWriter.py"
+  )
+
 ENDIF(GDCM_VTK)
 
 #-----------------------------------------------------------------------------
-INSTALL_FILES(/lib/gdcm/gdcmPython/demo "\\.py$")