X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2FCMakeLists.txt;h=b1e671f5fb1670ffd38d831696ee8346aa0d8de9;hb=f2956b2e24eb931cbd41e1c8e536259c93d325fa;hp=9622d80eb6dfbc670e1142dd5e05e8e195747937;hpb=45490622810d0706cb4ec538634c4a886f39737b;p=gdcm.git diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt index 9622d80e..b1e671f5 100644 --- a/gdcmPython/CMakeLists.txt +++ b/gdcmPython/CMakeLists.txt @@ -15,7 +15,7 @@ INCLUDE_DIRECTORIES( IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) # 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}/bin") + SET(CMAKE_SWIG_FLAGS "-outdir ${GDCM_BINARY_DIR}/gdcmPython") # Looks like a bug to me in cmake 2.0.x: SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS) @@ -25,7 +25,7 @@ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) #SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES PYTHON ON) SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES CPLUSPLUS ON) # Setting SWIG_FLAGS to "-includeall" at the following line looks like - # a bad idea since swig tries to reculsively include all the referenced + # a bad idea since swig tries to recursively include all the referenced # files, "including" the C++ , , ... Of course swig # has no way of finding the path to those files (unless it is told by # cmake) since they are related to the compiler installation layout. @@ -36,6 +36,15 @@ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES SWIG_FLAGS "") SWIG_ADD_MODULE(gdcm python gdcm.i) #gdcm_wrap.cxx SWIG_LINK_LIBRARIES(gdcm gdcm ${PYTHON_LIBRARIES}) + + SET(GDCM_CXX_FLAGS ${CMAKE_SWIG_FLAGS}) + # Get rid of -Wall / -W / -pedantic if exist + SET(CMAKE_CXX_FLAGS "") + # I guess I need to put them back on the this file: + SET_SOURCE_FILES_PROPERTIES(${GDCM_BINARY_DIR}/gdcmPython/gdcm_wrap.cxx + PROPERTIES COMPILE_FLAGS "") +# SET_TARGET_PROPERTIES(${GDCM_BINARY_DIR}/gdcmPython/gdcm_wrap.cxx +# PROPERTIES CMAKE_CXX_FLAGS "-foo") ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) @@ -125,28 +134,9 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) ${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) +INSTALL_TARGETS(/lib/gdcm/ _gdcm) #----------------------------------------------------------------------------- # VTK Wrapping @@ -161,6 +151,7 @@ IF(GDCM_VTK) SET(vtkgdcmPython_la_SOURCES ${GDCM_SOURCE_DIR}/vtk/vtkGdcmReader.cxx + ${GDCM_SOURCE_DIR}/vtk/vtkGdcmWriter.cxx ) SET_SOURCE_FILES_PROPERTIES(vtkGdcmReaderPython.cxx GENERATED) @@ -181,45 +172,84 @@ IF(GDCM_VTK) vtkgdcm vtkCommonPython vtkIOPython) + INSTALL_TARGETS(/lib/gdcm/ vtkgdcmPython) + ENDIF (GDCM_WRAP_PYTHON) ENDIF(GDCM_VTK) - # generate a setup.py according to VTK installation - # put it in subdir in order to not override old one - - GET_FILENAME_COMPONENT(VTKPATH ${VTK_DIR}/../../ ABSOLUTE) - CONFIGURE_FILE( - ${GDCM_SOURCE_DIR}/gdcmPython/setup.py.in - ${GDCM_BINARY_DIR}/setup.py - ) +# generate a setup.py according to VTK installation +# put it in subdir in order to not override old one +# +#GET_FILENAME_COMPONENT(VTKPATH ${VTK_DIR}/../../ ABSOLUTE) +#CONFIGURE_FILE( +# ${GDCM_SOURCE_DIR}/gdcmPython/setup.py.in +# ${GDCM_BINARY_DIR}/setup.py +#) #----------------------------------------------------------------------------- -# 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: - -FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/gdcm.pth - "gdcmPython\n" +# Python package configuration +FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/gdcmVersion.py + "gdcmVERSION=\"${GDCM_VERSION}\"\n" ) FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/__init__.py + "__all__ = [\"core\",\n" + " \"vtk\",\n" + " ]\n" + ) + +FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/core.py + "from gdcmVersion import *\n" "import gdcm\n" + "GDCM_DATA_ROOT = \"${GDCM_DATA_ROOT}\"\n" ) IF(GDCM_VTK) - FILE(APPEND ${GDCM_BINARY_DIR}/gdcmPython/__init__.py + FILE(WRITE ${GDCM_BINARY_DIR}/gdcmPython/vtk.py "import os\n" + "from gdcmVersion import *\n" "if os.name == 'posix':\n" " from libvtkgdcmPython import *\n" "else:\n" " from vtkgdcmPython import *\n" + "GDCM_DATA_ROOT = \"${GDCM_DATA_ROOT}\"\n" ) 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: