Commitc0915c3

authored

Merge pull request#303 from JohanMabille/pybind11

Upgraded to pybind11 >2.6

2 parentsa0f1bb6 +3df4fa5 commitc0915c3Copy full SHA for c0915c3

File tree

+10

-5

lines changed

+10

-5

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,13 +45,18 @@ else()`
`45`	`45`	`find_package(xtensor${xtensor_REQUIRED_VERSION} REQUIRED)`
`46`	`46`	`message(STATUS"Found xtensor:${xtensor_INCLUDE_DIRS}/xtensor")`
`47`	`47`	`endif()`
`48`		`-`
`49`		`-# Currently no required version for pybind11`
	`48`	`+`
	`49`	`+# Running find_package(PythonInterp) to retrieve the Python version`
	`50`	`+# which is not exported by Pybind11's cmake.`
	`51`	`+# Cf. https://github.com/pybind/pybind11/issues/2268`
	`52`	`+find_package(PythonInterp${PythonLibsNew_FIND_VERSION} REQUIRED)`
	`53`	`+`
	`54`	`+set(pybind11_REQUIRED_VERSION 2.6.1)`
`50`	`55`	`if(TARGET pybind11ORTARGET pybind11::headers)`
`51`	`56`	`# pybind11 has a variable that indicates its version already, so use that`
`52`	`57`	`message(STATUS"Found pybind11 v${pybind11_VERSION}")`
`53`	`58`	`else()`
`54`		`- find_package(pybind11 REQUIRED)`
	`59`	`+ find_package(pybind11${pybind11_REQUIRED_VERSION}REQUIRED)`
`55`	`60`	`message(STATUS"Found pybind11:${pybind11_INCLUDE_DIRS}/pybind11")`
`56`	`61`	`endif()`
`57`	`62`

Lines changed: 2 additions & 2 deletions

Comments

(0)