diff --git a/CMake/FindNumpy.cmake b/CMake/FindNumpy.cmake index 59e7d709e07da1714d464e4e0bcddbf105a2f25b..2e00bf677f49323de5ee8d9847144576ad12e065 100644 --- a/CMake/FindNumpy.cmake +++ b/CMake/FindNumpy.cmake @@ -1,6 +1,6 @@ # - Try to find the Python Numpy header files and loadable modules. # This find module tries to determine the directory path to the Numpy header -# files and the location of the loadable modules `multiarray` and `scalarmath`. +# files and the location of the loadable module `multiarray`. # # This find module requires that Python is installed on the host system. # @@ -9,7 +9,6 @@ # NUMPY_PATH - root directory of Numpy # NUMPY_INCLUDE_DIR - directory with the Numpy header files (cached) # NUMPY_MULTIARRAY_LIBRARY - full path to the `multiarray` module (cached) -# NUMPY_SCALARMATH_LIBRARY - full path to the `scalarmath` module (cached) # NUMPY_INCLUDE_DIRS - list of include directories # (identical to NUMPY_INCLUDE_DIR) # NUMPY_LIBRARIES - list of Numpy loadable modules @@ -65,12 +64,6 @@ if(NOT NUMPY_FOUND) PATH_SUFFIXES core) endif(NOT NUMPY_MULTIARRAY_LIBRARY) - if(NOT NUMPY_SCALARMATH_LIBRARY) - find_library(NUMPY_SCALARMATH_LIBRARY scalarmath - HINTS ${NUMPY_PATH} - PATH_SUFFIXES core) - endif(NOT NUMPY_SCALARMATH_LIBRARY) - # Reset the library prefix. set(CMAKE_FIND_LIBRARY_PREFIXES "${_cmake_find_library_prefixes}") @@ -79,13 +72,13 @@ if(NOT NUMPY_FOUND) # Handle the QUIETLY and REQUIRED arguments and set NUMPY_FOUND include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Numpy DEFAULT_MSG - NUMPY_MULTIARRAY_LIBRARY NUMPY_SCALARMATH_LIBRARY NUMPY_INCLUDE_DIR) + NUMPY_MULTIARRAY_LIBRARY NUMPY_INCLUDE_DIR) # Set non-cached variables if(NUMPY_FOUND) set(NUMPY_INCLUDE_DIRS "${NUMPY_INCLUDE_DIR}") set(NUMPY_LIBRARIES - "${NUMPY_MULTIARRAY_LIBRARY}" "${NUMPY_SCALARMATH_LIBRARY}") + "${NUMPY_MULTIARRAY_LIBRARY}" ) endif(NUMPY_FOUND) # Find the f2py program