* FIX : on X, the python part is correctly installed. All files are

     installed in gdcm sub-directory
   -- BeNours

diff --git a/Builder/CMakeLists.txt b/Builder/CMakeLists.txt
index c4163627447e2ff8bab2b28e15c4fb8c1048bab3..a45e9c5903ddb21358e45a05969eae1b1b4a6024 100644 (file)
--- a/Builder/CMakeLists.txt
+++ b/Builder/CMakeLists.txt
@@ -47,11 +47,6 @@ IF(UNIX)
       ${GDCM_BINARY_DIR}/Builder/gdcm.spec
   )
 
-#  ADD_CUSTOM_TARGET(TarGZ
-#    ALL
-#    ${GDCM_SOURCE_DIR}/../tar -zcvf ${GDCM_BINARY_DIR}/BUILDER/gdcm.tar.gz ${GDCM_SOURCE_DIR}
-#  )
-
   STRING(REGEX REPLACE ".*/" "" SPEC_SOURCE_DIR ${GDCM_SOURCE_DIR})
   EXEC_PROGRAM("date +%Y%m%d" OUTPUT_VARIABLE GDCM_DATE)
 

diff --git a/ChangeLog b/ChangeLog
index 64efbb8a6445738872eaf41a8536e9ef242e5122..5edcaf2e645c81e99f43ffe15ee2047ec73deac4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-20 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+   * FIX : on X, the python part is correctly installed. All files are 
+     installed in gdcm sub-directory
+
 2005-04-19 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
    * Builder/ : add something to facilitate the RPM creation of gdcm
 

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index c9cfa2a9e5f90a133998f812c2c4911ba72881d6..b1e671f5fb1670ffd38d831696ee8346aa0d8de9 100644 (file)
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -136,7 +136,7 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
 
 ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
 
-INSTALL_TARGETS(/lib/ _gdcm)
+INSTALL_TARGETS(/lib/gdcm/ _gdcm)
 
 #-----------------------------------------------------------------------------
 # VTK Wrapping
@@ -172,7 +172,7 @@ IF(GDCM_VTK)
                            vtkgdcm
                            vtkCommonPython
                            vtkIOPython)
-    INSTALL_TARGETS(/lib/ vtkgdcmPython)
+    INSTALL_TARGETS(/lib/gdcm/ vtkgdcmPython)
 
   ENDIF (GDCM_WRAP_PYTHON)
 ENDIF(GDCM_VTK)
@@ -187,22 +187,11 @@ ENDIF(GDCM_VTK)
 #)
 
 #-----------------------------------------------------------------------------
-# Install stuff:
-
-# Cmake cannot handle installing since python wants stuff to be installed
-# in /usr/lib/pythonx.x/site-package and not a a std /usr/lib
-# Thus generate a setup.py file using distutils
-
-# Create a gdcm.pth file:
-
+# Python package configuration
 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"
@@ -227,6 +216,40 @@ IF(GDCM_VTK)
     )
 ENDIF(GDCM_VTK)
 
+#-----------------------------------------------------------------------------
+# Python installation
+IF(WIN32)
+  FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/gdcmPython.pth
+       "${GDCM_BINARY_DIR}\n"
+       "${GDCM_BINARY_DIR}/bin/release\n"
+  )
+ELSE(WIN32)
+  FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/gdcmPython.pth
+       "${CMAKE_INSTALL_PREFIX}/lib/gdcm\n"
+  )
+ENDIF(WIN32)
+FIND_PATH(PYTHON_INSTALL "site-packages"
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]
+    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]
+    /usr/lib/python2.4
+    /usr/lib/python2.3
+    /usr/lib/python2.2
+    /usr/lib/python2.1
+    /usr/lib/python2.0
+    /usr/lib/python1.6
+    /usr/lib/python1.5
+)
+STRING(REGEX REPLACE "/usr(.*)/config.*" "\\1" PYTHON_INSTALL ${PYTHON_LIBRARY})
+
+INSTALL_FILES(${PYTHON_INSTALL}/site-packages "\\.pth$")
+INSTALL_FILES(/lib/gdcm/gdcmPython "\\.py$")
+INSTALL_FILES(/lib/gdcm/gdcmPython FILES "gdcm.py")
+
 #-----------------------------------------------------------------------------
 # Add test from demo subdir:
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 67156e45de6f97065c4c5ae683f0725c9fd639fa..30494062122a6cca68cac9dd6a910b5a8d69cd27 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -84,5 +84,5 @@ IF(CMAKE_SYSTEM MATCHES "SunOS.*")
   TARGET_LINK_LIBRARIES(gdcm socket nsl)
 ENDIF(CMAKE_SYSTEM MATCHES "SunOS.*")
 
-INSTALL_FILES(/include "\\.h$")
-INSTALL_TARGETS(/lib/ gdcm)
+INSTALL_FILES(/include/gdcm "\\.h$")
+INSTALL_TARGETS(/lib/gdcm/ gdcm)

diff --git a/src/gdcmjpeg/12/CMakeLists.txt b/src/gdcmjpeg/12/CMakeLists.txt
index 1cd516dfeaa9d559592d53af683a99d986cd16ab..a50a77f297ad90d8ee3679196ba56beedefe0bd4 100644 (file)
--- a/src/gdcmjpeg/12/CMakeLists.txt
+++ b/src/gdcmjpeg/12/CMakeLists.txt
@@ -4,6 +4,6 @@ INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_BINARY_DIR}"
   "${GDCMJPEG_SOURCE_DIR}")
 ADD_LIBRARY(gdcmjpeg12 ${JPEG_SOURCES})
-INSTALL_TARGETS(/lib/ gdcmjpeg12)
+INSTALL_TARGETS(/lib/gdcm/ gdcmjpeg12)
 
 

diff --git a/src/gdcmjpeg/16/CMakeLists.txt b/src/gdcmjpeg/16/CMakeLists.txt
index 70a45c4294f1195e6961b2160bdb83a9b4b8dfdd..369c9d59ad903b8202fd15a4cdd49f81517cf944 100644 (file)
--- a/src/gdcmjpeg/16/CMakeLists.txt
+++ b/src/gdcmjpeg/16/CMakeLists.txt
@@ -4,6 +4,6 @@ INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_BINARY_DIR}"
   "${GDCMJPEG_SOURCE_DIR}")
 ADD_LIBRARY(gdcmjpeg16 ${JPEG_SOURCES})
-INSTALL_TARGETS(/lib/ gdcmjpeg16)
+INSTALL_TARGETS(/lib/gdcm/ gdcmjpeg16)
 
 

diff --git a/src/gdcmjpeg/8/CMakeLists.txt b/src/gdcmjpeg/8/CMakeLists.txt
index fc99aa5a99bf84be23657a34a12cad33097100cf..9c6a1e7ce36a3663a27d393cebd10e140e600155 100644 (file)
--- a/src/gdcmjpeg/8/CMakeLists.txt
+++ b/src/gdcmjpeg/8/CMakeLists.txt
@@ -4,5 +4,5 @@ INCLUDE_DIRECTORIES(
   "${CMAKE_CURRENT_BINARY_DIR}"
   "${GDCMJPEG_SOURCE_DIR}")
 ADD_LIBRARY(gdcmjpeg8 ${JPEG_SOURCES})
-INSTALL_TARGETS(/lib/ gdcmjpeg8)
+INSTALL_TARGETS(/lib/gdcm/ gdcmjpeg8)
 

diff --git a/vtk/CMakeLists.txt b/vtk/CMakeLists.txt
index da5acb647a8bb76c5bc2f92f74d21c5057e5dd9d..bf3f5532779998cc76b61d4f2e3c6ca50aa8df37 100644 (file)
--- a/vtk/CMakeLists.txt
+++ b/vtk/CMakeLists.txt
@@ -67,8 +67,10 @@ TARGET_LINK_LIBRARIES(vtkWriteDicom
 
 #-----------------------------------------------------------------------------
 # Install vtk header
-INSTALL_FILES(/include FILES vtkGdcmReader.h)
-INSTALL_FILES(/include FILES vtkGdcmWriter.h)
+INSTALL_FILES(/include/gdcm FILES vtkGdcmReader.h)
+INSTALL_FILES(/include/gdcm FILES vtkGdcmWriter.h)
 
-INSTALL_TARGETS(/lib/ vtkgdcm)
+INSTALL_TARGETS(/lib/gdcm/ vtkgdcm)
+INSTALL_TARGETS(/bin/ vtkgdcmViewer)
+INSTALL_TARGETS(/bin/ vtkgdcmViewer2)