X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=gdcmPython%2FCMakeLists.txt;h=9e85703cd34402fdd914f2cf95106e2c75b92cc2;hb=83e08556218295a7c84cf631b63389f17322ac7a;hp=b6f7322beb1d832fd486b3495a567a94bf8556af;hpb=ed96b11a44a8e6ee7c3d091d069a04a683cdf2f6;p=gdcm.git diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt index b6f7322b..9e85703c 100644 --- a/gdcmPython/CMakeLists.txt +++ b/gdcmPython/CMakeLists.txt @@ -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. @@ -134,26 +134,6 @@ 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) @@ -170,6 +150,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) @@ -243,14 +224,6 @@ IF(GDCM_VTK) ) ENDIF(GDCM_VTK) -#----------------------------------------------------------------------------- -# Copy the testSuite.py file -CONFIGURE_FILE( - ${GDCM_SOURCE_DIR}/gdcmPython/testSuite.py - ${GDCM_BINARY_DIR}/gdcmPython/testSuite.py - COPYONLY -) - #----------------------------------------------------------------------------- # Add test from demo subdir: