diff --git a/CMake/FindNumpy.cmake b/CMake/FindNumpy.cmake index 8e798cc8f8..f488c4f614 100644 --- a/CMake/FindNumpy.cmake +++ b/CMake/FindNumpy.cmake @@ -1,35 +1,25 @@ # Variables set by this script # NUMPY_FOUND # NUMPY_INCLUDE_DIR - find_package(PackageHandleStandardArgs) -# numpy dir defined, own numpy deployed in python runtime -if(DEFINED Numpy_DIR AND EXISTS ${Numpy_DIR}) - if(EXISTS ${Numpy_DIR}/core/include) - set(NUMPY_INCLUDE_DIR ${Numpy_DIR}/core/include) - endif() -else() #numpy dir not defined - - set(_python ${PYTHON_EXECUTABLE}) - if(UNIX) - STRING(REPLACE " " "\ " _python ${PYTHON_EXECUTABLE}) - endif() +set(_python ${PYTHON_EXECUTABLE}) +if(UNIX) + STRING(REPLACE " " "\ " _python ${PYTHON_EXECUTABLE}) +endif() - execute_process ( - COMMAND ${_python} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]" - OUTPUT_VARIABLE output - OUTPUT_STRIP_TRAILING_WHITESPACE - ) +execute_process ( + COMMAND ${_python} -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print numpy.distutils.misc_util.get_numpy_include_dirs()[0]" + OUTPUT_VARIABLE output + OUTPUT_STRIP_TRAILING_WHITESPACE +) - if(DEFINED output AND EXISTS ${output} ) - set (NUMPY_INCLUDE_DIR ${output}) - endif() +if(DEFINED output AND EXISTS ${output} ) + set (NUMPY_INCLUDE_DIR ${output}) endif() FIND_PACKAGE_HANDLE_STANDARD_ARGS(Numpy DEFAULT_MSG NUMPY_INCLUDE_DIR) MARK_AS_ADVANCED ( NUMPY_INCLUDE_DIR ) - diff --git a/CMake/PackageDepends/MITK_Numpy_Config.cmake b/CMake/PackageDepends/MITK_Numpy_Config.cmake index d10c0eaa78..c3e1db29d7 100644 --- a/CMake/PackageDepends/MITK_Numpy_Config.cmake +++ b/CMake/PackageDepends/MITK_Numpy_Config.cmake @@ -1,4 +1,5 @@ if(MITK_USE_Python) find_package(Numpy REQUIRED) list(APPEND ALL_INCLUDE_DIRECTORIES ${NUMPY_INCLUDE_DIR}) + MESSAGE("NUMPY_INCLUDE_DIR: " ${NUMPY_INCLUDE_DIR}) endif()