From def46e1406409aebffa69097d83d7e1730352497 Mon Sep 17 00:00:00 2001 From: regrain Date: Fri, 21 Oct 2005 12:07:06 +0000 Subject: [PATCH] * Fix the unix installation for the python part -- BeNours --- CMakeLists.txt | 2 +- gdcmPython/CMakeLists.txt | 13 ++++++++++--- gdcmPython/demo/CMakeLists.txt | 13 ++++++++++++- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 48e2e508..382fb8d1 100644 --- 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 e1209af0..ba695739 100644 --- 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 23320d75..4c76a3ba 100644 --- 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$") -- 2.45.1