Skip to content
Snippets Groups Projects
Commit 30285e81 authored by Yan Grange's avatar Yan Grange :wave:
Browse files

Task #9377: Removed references to scalarmath from Findnumpy.cmake

parent c05f448c
Branches
No related tags found
No related merge requests found
# - Try to find the Python Numpy header files and loadable modules. # - Try to find the Python Numpy header files and loadable modules.
# This find module tries to determine the directory path to the Numpy header # 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. # This find module requires that Python is installed on the host system.
# #
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
# NUMPY_PATH - root directory of Numpy # NUMPY_PATH - root directory of Numpy
# NUMPY_INCLUDE_DIR - directory with the Numpy header files (cached) # NUMPY_INCLUDE_DIR - directory with the Numpy header files (cached)
# NUMPY_MULTIARRAY_LIBRARY - full path to the `multiarray` module (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 # NUMPY_INCLUDE_DIRS - list of include directories
# (identical to NUMPY_INCLUDE_DIR) # (identical to NUMPY_INCLUDE_DIR)
# NUMPY_LIBRARIES - list of Numpy loadable modules # NUMPY_LIBRARIES - list of Numpy loadable modules
...@@ -65,12 +64,6 @@ if(NOT NUMPY_FOUND) ...@@ -65,12 +64,6 @@ if(NOT NUMPY_FOUND)
PATH_SUFFIXES core) PATH_SUFFIXES core)
endif(NOT NUMPY_MULTIARRAY_LIBRARY) 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. # Reset the library prefix.
set(CMAKE_FIND_LIBRARY_PREFIXES "${_cmake_find_library_prefixes}") set(CMAKE_FIND_LIBRARY_PREFIXES "${_cmake_find_library_prefixes}")
...@@ -79,13 +72,13 @@ if(NOT NUMPY_FOUND) ...@@ -79,13 +72,13 @@ if(NOT NUMPY_FOUND)
# Handle the QUIETLY and REQUIRED arguments and set NUMPY_FOUND # Handle the QUIETLY and REQUIRED arguments and set NUMPY_FOUND
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Numpy DEFAULT_MSG 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 # Set non-cached variables
if(NUMPY_FOUND) if(NUMPY_FOUND)
set(NUMPY_INCLUDE_DIRS "${NUMPY_INCLUDE_DIR}") set(NUMPY_INCLUDE_DIRS "${NUMPY_INCLUDE_DIR}")
set(NUMPY_LIBRARIES set(NUMPY_LIBRARIES
"${NUMPY_MULTIARRAY_LIBRARY}" "${NUMPY_SCALARMATH_LIBRARY}") "${NUMPY_MULTIARRAY_LIBRARY}" )
endif(NUMPY_FOUND) endif(NUMPY_FOUND)
# Find the f2py program # Find the f2py program
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment