Commitcbccfb2

committed

Trying generalised fix

1 parente8fa517 commitcbccfb2Copy full SHA for cbccfb2

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,12 @@ 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 INTERFACE_COMPILE_OPTIONS /DHAVE_SNPRINTF)`
	`85`	`+else()`
	`86`	`+ set_property(TARGET xtensor-python PROPERTY INTERFACE_COMPILE_OPTIONS -DHAVE_SNPRINTF)`
	`87`	`+endif()`
	`88`	`+`
`83`	`89`	`OPTION(BUILD_TESTS"xtensor test suite"OFF)`
`84`	`90`	`OPTION(DOWNLOAD_GTEST"build gtest from downloaded sources"OFF)`
`85`	`91`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"`
`54`	`54`	`endif()`
`55`	`55`
`56`	`56`	`if(MSVC)`
`57`		`- set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} /EHsc /MP /bigobj /DHAVE_SNPRINTF")`
	`57`	`+ set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} /EHsc /MP /bigobj")`
`58`	`58`	`set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)`
`59`	`59`	`foreach(flag_var`
`60`	`60`	`CMAKE_CXX_FLAGSCMAKE_CXX_FLAGS_DEBUGCMAKE_CXX_FLAGS_RELEASE`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"`
`41`	`41`	`endif()`
`42`	`42`
`43`	`43`	`if(MSVC)`
`44`		`- set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} /EHsc /MP /bigobj /DHAVE_SNPRINTF")`
	`44`	`+ set(CMAKE_CXX_FLAGS"${CMAKE_CXX_FLAGS} /EHsc /MP /bigobj")`
`45`	`45`	`set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)`
`46`	`46`	`endif()`
`47`	`47`

Comments

(0)