[Sdif-cvs] Easdif/swig/python CMakeLists.txt,1.17,1.18

[Axel R. <ro...@us...>]

Update of /cvsroot/sdif/Easdif/swig/python
In directory vz-cvs-3.sog:/tmp/cvs-serv24049

Modified Files:
	CMakeLists.txt 
Log Message:
Removed debug output and fixed determination of numpy include path.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/sdif/Easdif/swig/python/CMakeLists.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CMakeLists.txt	2 Sep 2012 01:19:03 -0000	1.17
--- CMakeLists.txt	2 Sep 2012 22:24:43 -0000	1.18
***************
*** 21,33 ****
  
    EXECUTE_PROCESS(COMMAND ${PYTHON} -c "import numpy\nif hasattr(numpy,'get_include'):\n ss=numpy.get_include()\nelse: ss=numpy.get_numpy_include()\nprint ss" OUTPUT_VARIABLE out ERROR_VARIABLE err OUTPUT_STRIP_TRAILING_WHITESPACE)
-   MESSAGE("out ${out}")
-   MESSAGE("err ${err}")
    STRING(REGEX REPLACE "[ \t]+" ";" NUMPY_INC_HINT ${out})
!   MESSAGE("NUMPY_INC_HINT ${NUMPY_INC_HINT}")
!   FIND_PATH(NUMPY_INCLUDE NAME "numpy/arrayobject.h" PATHS "{NUMPY_INC_HINT}")
    MESSAGE("NUMPY_INCLUDE ${NUMPY_INCLUDE}")
  
    IF (NUMPY_INCLUDE)
-     MESSAGE("NUMPY_INCLUDE ${NUMPY_INCLUDE}")
      INCLUDE_DIRECTORIES("${NUMPY_INCLUDE}")    
    ENDIF(NUMPY_INCLUDE)
--- 21,29 ----
  
    EXECUTE_PROCESS(COMMAND ${PYTHON} -c "import numpy\nif hasattr(numpy,'get_include'):\n ss=numpy.get_include()\nelse: ss=numpy.get_numpy_include()\nprint ss" OUTPUT_VARIABLE out ERROR_VARIABLE err OUTPUT_STRIP_TRAILING_WHITESPACE)
    STRING(REGEX REPLACE "[ \t]+" ";" NUMPY_INC_HINT ${out})
!   FIND_PATH(NUMPY_INCLUDE NAME "numpy/arrayobject.h" PATHS "${NUMPY_INC_HINT}")
    MESSAGE("NUMPY_INCLUDE ${NUMPY_INCLUDE}")
  
    IF (NUMPY_INCLUDE)
      INCLUDE_DIRECTORIES("${NUMPY_INCLUDE}")    
    ENDIF(NUMPY_INCLUDE)
***************
*** 72,76 ****
      ${PYTHON} setup2.py build
      DEPENDS  Easdif_static_pic${DEBUGEXT}
!     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/easdif-python.i ${CMAKE_CURRENT_SOURCE_DIR}/numpy.i ${CMAKE_CURRENT_SOURCE_DIR}/sdiftypemap-python.i
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
      )
--- 68,72 ----
      ${PYTHON} setup2.py build
      DEPENDS  Easdif_static_pic${DEBUGEXT}
!     SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/easdif-python.i ${CMAKE_CURRENT_SOURCE_DIR}/../numpy.i ${CMAKE_CURRENT_SOURCE_DIR}/sdiftypemap-python.i
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
      )