Commit3ffb0e4

authored and

committed

Use FindPython's numpy component to find numpy include directories

1 parentd4dd6ce commit3ffb0e4Copy full SHA for 3ffb0e4

File tree

-93

lines changed

-93

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`# The full license is in the file LICENSE, distributed with this software. #`
`8`	`8`	`############################################################################`
`9`	`9`
`10`		`-cmake_minimum_required(VERSION3.1)`
	`10`	`+cmake_minimum_required(VERSION3.14)`
`11`	`11`	`project(xtensor-python)`
`12`	`12`
`13`	`13`	`set(CMAKE_MODULE_PATH${PROJECT_SOURCE_DIR}/cmake${CMAKE_MODULE_PATH})`
`@@ -60,8 +60,8 @@ else()`
`60`	`60`	`message(STATUS"Found pybind11:${pybind11_INCLUDE_DIRS}/pybind11")`
`61`	`61`	`endif()`
`62`	`62`
`63`		`-find_package(NumPyREQUIRED)`
`64`		`-message(STATUS"Found numpy:${NUMPY_INCLUDE_DIRS}")`
	`63`	`+# Look forNumPyheaders`
	`64`	`+find_package(PythonREQUIREDCOMPONENTSNumPy)`
`65`	`65`
`66`	`66`	`# Build`
`67`	`67`	`# =====`
`@@ -80,7 +80,7 @@ set(XTENSOR_PYTHON_HEADERS`
`80`	`80`
`81`	`81`	`add_library(xtensor-pythonINTERFACE)`
`82`	`82`	`target_include_directories(xtensor-pythonINTERFACE`
`83`		`-"$<BUILD_INTERFACE:${XTENSOR_PYTHON_INCLUDE_DIR};${pybind11_INCLUDE_DIRS};${NUMPY_INCLUDE_DIRS}>"`
	`83`	`+"$<BUILD_INTERFACE:${XTENSOR_PYTHON_INCLUDE_DIR};${pybind11_INCLUDE_DIRS};${Python_NumPy_INCLUDE_DIRS}>"`
`84`	`84`	`$<INSTALL_INTERFACE:include>)`
`85`	`85`	`target_link_libraries(xtensor-pythonINTERFACExtensor)`
`86`	`86`	`get_target_property(inc_dirxtensor-pythonINTERFACE_INCLUDE_DIRECTORIES)`

Lines changed: 0 additions & 89 deletions

This file was deleted.

Comments

(0)