X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2FCMakeLists.txt;h=c9cfa2a9e5f90a133998f812c2c4911ba72881d6;hb=985954a7af00b467b183bb3f5db9dc11f89fcaf5;hp=faeedec531da338b04cf3f08d23994f4d8112dd7;hpb=ad06106b0ba563d9cc4405ae6440e8ee0ead51c3;p=gdcm.git diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt index faeedec5..c9cfa2a9 100644 --- a/gdcmPython/CMakeLists.txt +++ b/gdcmPython/CMakeLists.txt @@ -14,19 +14,38 @@ 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}/gdcmPython") + # Looks like a bug to me in cmake 2.0.x: + SEPARATE_ARGUMENTS(CMAKE_SWIG_FLAGS) + FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) - #INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) - - #SET(CMAKE_SWIG_FLAGS "") - + #SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES PYTHON ON) SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES CPLUSPLUS ON) - SET_SOURCE_FILES_PROPERTIES(gdcm.i PROPERTIES SWIG_FLAGS "-includeall") - SWIG_ADD_MODULE(gdcm python gdcm.i gdcm_wrap.cxx) - SWIG_LINK_LIBRARIES(gdcm ${PYTHON_LIBRARIES}) - TARGET_LINK_LIBRARIES(_gdcm gdcm) - + # Setting SWIG_FLAGS to "-includeall" at the following line looks like + # 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. + # Anyhow, since this inclusion recursion is not necessary, just don't + # do it. + # Note: apparently the line is required in order to avoid a NOTFOUND + # as argument of swig on invocation of make. + 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) # As of 09/10/2003 there was no FindSWIG.cmake @@ -72,7 +91,7 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9) # Then create the gdcm.py = gdcmVersion.py + gdcm.py (swig) file: FILE(WRITE ${GDCM_BINARY_DIR}/bin/gdcmVersion.py "import os\n" - "gdcmVERSION=\"${GDCM_VERSION_FULL}\"\n" + "gdcmVERSION=\"${GDCM_VERSION}\"\n" "GDCM_DATA_PATH=\"${GDCM_DATA_ROOT}\"\n\n" ${SWIG_GDCM_PY} ) @@ -115,39 +134,24 @@ 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) #----------------------------------------------------------------------------- # VTK Wrapping # IF(GDCM_VTK) + # Include the VTK library + INCLUDE(${VTK_USE_FILE}) + INCLUDE_DIRECTORIES( ${GDCM_SOURCE_DIR}/vtk ) SET(vtkgdcmPython_la_SOURCES ${GDCM_SOURCE_DIR}/vtk/vtkGdcmReader.cxx + ${GDCM_SOURCE_DIR}/vtk/vtkGdcmWriter.cxx ) SET_SOURCE_FILES_PROPERTIES(vtkGdcmReaderPython.cxx GENERATED) @@ -161,23 +165,27 @@ IF(GDCM_VTK) # The C++ files must be made into a C++ library ADD_LIBRARY(vtkgdcmPython SHARED ${gdcmWrapSOURCES}) #MODULE on apple ? # set the libraries to link against + #SET_TARGET_PROPERTIES(${foobar} PROPERTIES PREFIX "") + + #GET_TARGET_PROPERTY(swig_gdcm_fullpath "${SWIG_MODULE_gdcm_REAL_NAME}" LOCATION) TARGET_LINK_LIBRARIES (vtkgdcmPython - pygdcm vtkgdcm vtkCommonPython vtkIOPython) + INSTALL_TARGETS(/lib/ vtkgdcmPython) + ENDIF (GDCM_WRAP_PYTHON) - - # 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}/gdcmPython/setup.py - ) 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 +#) + #----------------------------------------------------------------------------- # Install stuff: @@ -185,6 +193,39 @@ ENDIF(GDCM_VTK) # 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/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" + " ]\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(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) #----------------------------------------------------------------------------- # Add test from demo subdir: