X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2FCMakeLists.txt;h=e25d0d95a3bae39e342c3fac140b4b7d0f53a316;hb=0055d8cfce3c665a26e1591133b3a6836a512e7e;hp=0f73e8f402724483919931d8b0442d6cc3fc5941;hpb=55659173e732ba10873db1b8c32fc18de9bea0ff;p=gdcm.git

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index 0f73e8f4..e25d0d95 100644
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -2,6 +2,7 @@
 
 INCLUDE_DIRECTORIES(
   ${GDCM_SOURCE_DIR}/src
+  ${GDCM_SOURCE_DIR}/gdcmPython
   ${PYTHON_INCLUDE_PATH}
   ${GDCM_BINARY_DIR}/
 )
@@ -14,6 +15,7 @@ INCLUDE_DIRECTORIES(
 
 # 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\"")
+#SET(CMAKE_SWIG_OUTDIR "${GDCM_BINARY_DIR}/gdcmPython")
 # Looks like a bug to me in cmake 2.0.x:
 SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS)
 
@@ -124,23 +126,41 @@ IF(WIN32)
        "${GDCM_BINARY_DIR}\n"
        "${GDCM_BINARY_DIR}/bin/release\n"
   )
+  FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/InstallOnly/gdcmPython.pth
+       "${GDCM_SOURCE_DIR}\n"
+       "${GDCM_SOURCE_DIR}/bin\n"
+  )
 ELSE(WIN32)
   FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/gdcmPython.pth
        "${CMAKE_INSTALL_PREFIX}/lib/gdcm\n"
   )
+  FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/InstallOnly/gdcmPython.pth
+       "/usr/lib/gdcm\n"
+  )
 ENDIF(WIN32)
 
-FIND_PATH(PYTHON_DIR "site-packages"
-   /usr/lib/python2.4
-   /usr/lib/python2.3
-   /usr/lib/python2.2
-   /usr/lib/python2.1
-) 
-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 a python path file in site-packages that tells
+# python where to find the gdcmPython module
+IF(UNIX)
+  FIND_PATH(PYTHON_DIR "site-packages"
+     /usr/lib/python2.4
+     /usr/lib/python2.3
+     /usr/lib/python2.2
+     /usr/lib/python2.1
+  ) 
+  STRING(REGEX REPLACE "/usr" "" PYTHON_DIR ${PYTHON_DIR})
+
+  INSTALL_FILES(${PYTHON_DIR}/site-packages FILES 
+    "${GDCM_BINARY_DIR}/gdcmPython/InstallOnly/gdcmPython.pth"
+  )
+  INSTALL_FILES(/lib/gdcm/gdcmPython FILES 
+    "gdcm.py" 
+    "__init__.py" 
+    "gdcmVersion.py" 
+    "core.py" 
+    "vtk.py"
+  )
+ENDIF(UNIX)
 
 #-----------------------------------------------------------------------------
 # Add test from demo subdir: