]> Creatis software - gdcm.git/commitdiff
Minor clean up
authormalaterre <malaterre>
Wed, 12 May 2004 03:36:05 +0000 (03:36 +0000)
committermalaterre <malaterre>
Wed, 12 May 2004 03:36:05 +0000 (03:36 +0000)
gdcmPython/CMakeLists.txt

index 0899d296aecd67941690c84a43938f4c595a825b..a718595ec9b7baf0d2656a12cd1b7b2f9f1f5493 100644 (file)
@@ -25,19 +25,19 @@ IF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   FIND_PACKAGE(SWIG REQUIRED)
   INCLUDE(${SWIG_USE_FILE})
 
-  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+  #INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-  SET(CMAKE_SWIG_FLAGS "")
+  #SET(CMAKE_SWIG_FLAGS "")
 
   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)
 
 ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
 
-  # Since the file gdcm_wrap.cxx does not exist, mark it as GENERATED:
   ADD_LIBRARY(pygdcm gdcm_wrap.cxx)
 
   # As of 09/10/2003 there was no FindSWIG.cmake
@@ -55,6 +55,7 @@ ELSE(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)
   )
   # This swig command will also outputs gdcm.py :
   SET_SOURCE_FILES_PROPERTIES(gdcm.py GENERATED)
+  # Since the file gdcm_wrap.cxx does not exist, mark it as GENERATED:
   SET_SOURCE_FILES_PROPERTIES(gdcm_wrap.cxx GENERATED)
 
   TARGET_LINK_LIBRARIES(pygdcm