Swig should be found on win32 now, some cosmetic cleanup too

[gdcm.git] / gdcmPython / CMakeLists.txt

diff --git a/gdcmPython/CMakeLists.txt b/gdcmPython/CMakeLists.txt
index 0899d296aecd67941690c84a43938f4c595a825b..d1afeda1f982e5f31848d713d8bdf52a394e2f18 100644 (file)
--- a/gdcmPython/CMakeLists.txt
+++ b/gdcmPython/CMakeLists.txt
@@ -25,27 +25,33 @@ 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
   # later we should use SWIG instead of swig
+  FIND_PROGRAM(SWIG_EXECUTABLE
+    NAMES swig-1.3 swig
+  )
+  
+  IF(NOT SWIG_EXECUTABLE)
+    MESSAGE(FATAL_ERROR "Swig could not be found wrapping is impossible")
+  ENDIF(NOT SWIG_EXECUTABLE)
+  
   # Build our custom command :
   ADD_CUSTOM_COMMAND(
     TARGET    pygdcm
-    COMMAND   swig
+    COMMAND   ${SWIG_EXECUTABLE}
     ARGS      -python -c++ -I${GDCM_SOURCE_DIR}/src -o 
               ${GDCM_BINARY_DIR}/gdcmPython/gdcm_wrap.cxx 
               ${GDCM_SOURCE_DIR}/gdcmPython/gdcm.i 
@@ -55,14 +61,16 @@ 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)
 
+  ADD_LIBRARY(pygdcm gdcm_wrap.cxx)
   TARGET_LINK_LIBRARIES(pygdcm
     ${PYTHON_LIBRARY}
     gdcm
   )
   # http://www.cmake.org/pipermail/cmake/2003-August/004190.html
-  # SET_TARGET_PROPERTIES(pygdcm PROPERTIES PREFIX "_")
+  SET_TARGET_PROPERTIES(pygdcm PROPERTIES PREFIX "_")
 
 ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 1.9)   
 
@@ -88,7 +96,7 @@ IF(GDCM_VTK)
     ADD_LIBRARY(vtkgdcmPython SHARED ${gdcmfoo})
     # set the libraries to link against
     TARGET_LINK_LIBRARIES (vtkgdcmPython
-                           pygdcm
+                           #_pygdcm
                            vtkgdcm
                            vtkCommonPython
                            vtkIOPython)