Commite1ea0e7

committed

Adding workaround for define in Python.h

1 parent2c7df32 commite1ea0e7Copy full SHA for e1ea0e7

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ foreach(ver ${xtensor_python_version_defines})`
`25`	`25`	`set(XTENSOR_PYTHON_VERSION_${CMAKE_MATCH_1}"${CMAKE_MATCH_2}"CACHEINTERNAL"")`
`26`	`26`	`endif()`
`27`	`27`	`endforeach()`
`28`		`-set(${PROJECT_NAME}_VERSION`
	`28`	`+set(${PROJECT_NAME}_VERSION`
`29`	`29`	`${XTENSOR_PYTHON_VERSION_MAJOR}.${XTENSOR_PYTHON_VERSION_MINOR}.${XTENSOR_PYTHON_VERSION_PATCH})`
`30`	`30`	`message(STATUS"xtensor-python v${${PROJECT_NAME}_VERSION}")`
`31`	`31`
`@@ -45,7 +45,7 @@ else()`
`45`	`45`	`find_package(xtensor${xtensor_REQUIRED_VERSION} REQUIRED)`
`46`	`46`	`message(STATUS"Found xtensor:${xtensor_INCLUDE_DIRS}/xtensor")`
`47`	`47`	`endif()`
`48`		`-`
	`48`	`+`
`49`	`49`	`# Currently no required version for pybind11`
`50`	`50`	`if(TARGET pybind11ORTARGET pybind11::headers)`
`51`	`51`	`# pybind11 has a variable that indicates its version already, so use that`
`@@ -80,6 +80,10 @@ target_include_directories(xtensor-python INTERFACE`
`80`	`80`	`target_link_libraries(xtensor-pythonINTERFACE xtensor)`
`81`	`81`	`get_target_property(inc_dir xtensor-pythonINTERFACE_INCLUDE_DIRECTORIES)`
`82`	`82`
	`83`	`+if(MSVC)`
	`84`	`+ set_property(TARGET xtensor-python PROPERTY /DHAVE_SNPRINTF)`
	`85`	`+else()`
	`86`	`+`
`83`	`87`	`OPTION(BUILD_TESTS"xtensor test suite"OFF)`
`84`	`88`	`OPTION(DOWNLOAD_GTEST"build gtest from downloaded sources"OFF)`
`85`	`89`

Comments

(0)