From 4b91dba73a6b98d92e372f65be46cdf574ce7cfa Mon Sep 17 00:00:00 2001 From: malaterre Date: Thu, 9 Oct 2003 16:16:59 +0000 Subject: [PATCH] * FIX: http://www.cmake.org/pipermail/cmake/2003-October/004369.html * FIX: http://www.cmake.org/pipermail/cmake/2003-October/004373.html --- gdcmPython/CMakeLists.txt | 11 +++++++---- src/CMakeLists.txt | 17 ++++++++++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt index 36676c79..dc1ac9e5 100644 --- a/gdcmPython/CMakeLists.txt +++ b/gdcmPython/CMakeLists.txt @@ -25,6 +25,7 @@ SET(SWIG_INC ${GDCM_INC} ) +ADD_CUSTOM_TARGET(mathieu ALL) SET(GDCM_PYTHON_SOURCES gdcm_wrap.cxx @@ -32,15 +33,17 @@ SET(GDCM_PYTHON_SOURCES SET_SOURCE_FILES_PROPERTIES(gdcm_wrap.cxx GENERATED) +ADD_LIBRARY(pygdcm ${GDCM_PYTHON_SOURCES}) + + ADD_CUSTOM_COMMAND( SOURCE ${GDCM_SOURCE_DIR}/gdcmPython/gdcm.i COMMAND swig -ARGS -python -c++ -I${GDCM_SOURCE_DIR}/src -o gdcm_wrap.cxx ${GDCM_SOURCE_DIR}/gdcmPython/gdcm.i -OUTPUTS gdcm_wrap.cxx -TARGET pygdcm +ARGS -python -c++ -I${GDCM_SOURCE_DIR}/src -o ${GDCM_BINARY_DIR}/gdcmPython/gdcm_wrap.cxx ${GDCM_SOURCE_DIR}/gdcmPython/gdcm.i +TARGET mathieu +OUTPUTS ${GDCM_BINARY_DIR}/gdcmPython/gdcm_wrap.cxx ) -ADD_LIBRARY(pygdcm ${GDCM_PYTHON_SOURCES}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c5f999bd..0ae9be8e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,15 +28,22 @@ SET(libgdcm_la_SOURCES #Why one should not use ADD_DEFINITIONS #http://www.cmake.org/pipermail/cmake/2003-September/004286.html #ADD_DEFINITIONS(-DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}/\\") -ADD_DEFINITIONS(-D__STDC_LIMIT_MACROS) +#ADD_DEFINITIONS(-D__STDC_LIMIT_MACROS) -SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES} - PROPERTIES - COMPILE_FLAGS -D__STDC_LIMIT_MACROS - COMPILE_FLAGS -DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\" +#SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES} +# PROPERTIES +# COMPILE_FLAGS -D__STDC_LIMIT_MACROS +# COMPILE_FLAGS -DPUB_DICT_PATH=\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\" +#) + + +SET_SOURCE_FILES_PROPERTIES(${libgdcm_la_SOURCES} + PROPERTIES + COMPILE_FLAGS "-D__STDC_LIMIT_MACROS -DPUB_DICT_PATH=\\\"${CMAKE_INSTALL_PREFIX}${GDCM_DATA_DIR}\\\"" ) + #libgdcminclude_HEADERS = \ # gdcmException.h \ # gdcmHeader.h \ -- 2.48.1