Use FindPython's numpy component to find numpy include directories · traversaro/xtensor-python@3ffb0e4 · GitHub

1. traversaro
2. xtensor-python

Repository navigation

• Code
• Pull requests1 (1)
• Actions
• Projects
• Security and quality
• Insights

Commit 3ffb0e4

Browse filesBrowse the repository at this point in the historyBrowse files

dokempf

authored and

JohanMabille

committed

Use FindPython's numpy component to find numpy include directories

1 parent d4dd6ce commit 3ffb0e4
Copy full SHA for 3ffb0e4

2 files changed

+4-93Lines changed: 4 additions & 93 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• CMakeLists.txt
• cmake
  • FindNumPy.cmake

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎CMakeLists.txt‎

Copy file name to clipboardExpand all lines: CMakeLists.txt

+4-4Lines 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(VERSION 3.1)
	10	+ cmake_minimum_required(VERSION 3.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(NumPy REQUIRED)
64		- message(STATUS "Found numpy: ${NUMPY_INCLUDE_DIRS}")
	63	+ # Look for NumPy headers
	64	+ find_package(Python REQUIRED COMPONENTS NumPy)
65	65
66	66	# Build
67	67	# =====
@@ -80,7 +80,7 @@ set(XTENSOR_PYTHON_HEADERS
80	80
81	81	add_library(xtensor-python INTERFACE)
82	82	target_include_directories(xtensor-python INTERFACE
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-python INTERFACE xtensor)
86	86	get_target_property(inc_dir xtensor-python INTERFACE_INCLUDE_DIRECTORIES)

Collapse file

‎cmake/FindNumPy.cmake‎

Copy file name to clipboardExpand all lines: cmake/FindNumPy.cmake

-89Lines changed: 0 additions & 89 deletions

This file was deleted.

0 commit comments

Comments

0 (0)