diff --git a/CMake/FindNumpy.cmake b/CMake/FindNumpy.cmake index f488c4f614..006ca7ce9a 100644 --- a/CMake/FindNumpy.cmake +++ b/CMake/FindNumpy.cmake @@ -1,25 +1,29 @@ # Variables set by this script # NUMPY_FOUND # NUMPY_INCLUDE_DIR find_package(PackageHandleStandardArgs) -set(_python ${PYTHON_EXECUTABLE}) -if(UNIX) - STRING(REPLACE " " "\ " _python ${PYTHON_EXECUTABLE}) -endif() +if(DEFINED Numpy_DIR AND EXISTS ${Numpy_DIR}) + set(NUMPY_INCLUDE_DIR ${Numpy_DIR}/core/include +else() + 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}) + if(DEFINED output AND EXISTS ${output} ) + set (NUMPY_INCLUDE_DIR ${output}) + endif() 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 c3e1db29d7..2e2e10da27 100644 --- a/CMake/PackageDepends/MITK_Numpy_Config.cmake +++ b/CMake/PackageDepends/MITK_Numpy_Config.cmake @@ -1,5 +1,6 @@ if(MITK_USE_Python) find_package(Numpy REQUIRED) list(APPEND ALL_INCLUDE_DIRECTORIES ${NUMPY_INCLUDE_DIR}) MESSAGE("NUMPY_INCLUDE_DIR: " ${NUMPY_INCLUDE_DIR}) + MESSAGE("PYTHON_EXECUTABLE: " ${PYTHON_EXECUTABLE}) endif()