X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=gdcmPython%2FCMakeLists.txt;h=420a15f524d347fb74dcf578d00a8102d007dc77;hb=fcdedae1d9bed0bc794fc6d5f66310f1840e061d;hp=a75ed020007a40de1fe7465196da5c3c5ab530e4;hpb=dfe6cb9cbe1e8139c2b605ef7661278ed6e2e1bf;p=gdcm.git

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index a75ed020..420a15f5 100644
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -5,12 +5,7 @@ INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_PATH}
   ${GDCM_BINARY_DIR}/
 )
-
-#-----------------------------------------------------------------------------
-# Create the gdcmVersion.py file:
-FILE(WRITE ${GDCM_BINARY_DIR}/gdcmVersion.py
-  "gdcmVERSION=\"${GDCM_VERSION_FULL}\""
-  )
+SUBDIRS(demo)
 
 #-----------------------------------------------------------------------------
 # SWIG Wrapping
@@ -58,15 +53,6 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   )
   # Since the file gdcm_wrap.cxx does not exist, mark it as GENERATED:
   SET_SOURCE_FILES_PROPERTIES(gdcm_wrap.cxx GENERATED)
-  # This swig command will also outputs gdcm.py :
-  SET_SOURCE_FILES_PROPERTIES(gdcm.py GENERATED)
-  # Then add the custom command to copy it to proper location:
-  ADD_CUSTOM_COMMAND(
-    TARGET pygdcm
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND}
-    ARGS -E copy ${GDCM_BINARY_DIR}/gdcmPython/gdcm.py ${GDCM_BINARY_DIR}/bin
-  )
 
   ADD_LIBRARY(pygdcm gdcm_wrap.cxx)
   TARGET_LINK_LIBRARIES(pygdcm
@@ -76,6 +62,79 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   # http://www.cmake.org/pipermail/cmake/2003-August/004190.html
   #SET_TARGET_PROPERTIES(pygdcm PROPERTIES PREFIX "_")
 
+  # This swig command will also outputs gdcm.py :
+  SET_SOURCE_FILES_PROPERTIES(gdcm.py GENERATED)
+
+  # Instead of a simple copy operation let create our own gdcm.py file:
+  # First read what swig dumped:
+  FILE(READ ${GDCM_BINARY_DIR}/gdcmPython/gdcm.py SWIG_GDCM_PY)
+
+  # Then create the gdcm.py = gdcmVersion.py + gdcm.py (swig) file:
+  FILE(WRITE ${GDCM_BINARY_DIR}/bin/gdcm.py
+    "import os\n"
+    "gdcmVERSION=\"${GDCM_VERSION_FULL}\"\n"
+    "GDCM_DATA_PATH=\"${GDCM_DATA_ROOT}\"\n\n"
+    ${SWIG_GDCM_PY}
+    )
+
+  # Seems like they want instead a file called gdcmPython.py
+  # Thus add the custom command to copy it to proper location:
+  ADD_CUSTOM_COMMAND(
+    TARGET pygdcm
+    PRE_BUILD
+    COMMAND ${CMAKE_COMMAND}
+    ARGS -E copy 
+      ${GDCM_BINARY_DIR}/bin/gdcm.py 
+      ${GDCM_BINARY_DIR}/bin/gdcmPython.py
+  )
+
+  # Here comes the hack to rename the library to a more 'swig' compliant scheme"
+  SET(LIB_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}pygdcm${CMAKE_SHARED_LIBRARY_SUFFIX})
+  SET(EXE_DIR ${GDCM_BINARY_DIR}/Executable)
+  IF(EXECUTABLE_OUTPUT_PATH)
+    SET(EXE_DIR ${EXECUTABLE_OUTPUT_PATH})
+  ENDIF(EXECUTABLE_OUTPUT_PATH)
+  SET(LIB_DIR ${GDCM_BINARY_DIR}/Library/Shared)
+  IF(LIBRARY_OUTPUT_PATH)
+    SET(LIB_DIR ${LIBRARY_OUTPUT_PATH})
+  ENDIF(LIBRARY_OUTPUT_PATH)
+
+  IF(WIN32 OR APPLE)
+    SET(SHARED_MUST_BE_IN_EXE_DIR 1)
+  ENDIF(WIN32 OR APPLE)
+
+  IF(NOT SHARED_MUST_BE_IN_EXE_DIR)
+    SET(EXE_DIR ${LIB_DIR}) 
+  ENDIF(NOT SHARED_MUST_BE_IN_EXE_DIR)
+
+  ADD_CUSTOM_COMMAND(
+    TARGET pygdcm
+    POST_BUILD 
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy
+    ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}
+    ${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)