Skip to content

Commit cbccfb2

Browse files
committed
Trying generalised fix
1 parent e8fa517 commit cbccfb2

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ target_include_directories(xtensor-python INTERFACE
8080
target_link_libraries(xtensor-python INTERFACE xtensor)
8181
get_target_property(inc_dir xtensor-python INTERFACE_INCLUDE_DIRECTORIES)
8282

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+
8389
OPTION(BUILD_TESTS "xtensor test suite" OFF)
8490
OPTION(DOWNLOAD_GTEST "build gtest from downloaded sources" OFF)
8591

benchmark/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
5454
endif()
5555

5656
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")
5858
set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)
5959
foreach(flag_var
6060
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
4141
endif()
4242

4343
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")
4545
set(CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO)
4646
endif()
4747

0 commit comments

Comments
 (0)