Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-29 00:22:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip boost::variant tests on unsupported compilers and versions of Boost

Browse Source
This commit is contained in:
Dean Moldovan 2017-08-25 21:11:36 +02:00
parent c14c2762f6
commit c40ef612cc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/CMakeLists.txt
View File

@ -114,8 +114,8 @@ if(PYBIND11_TEST_FILES_EIGEN_I GREATER -1)
endif() endif()
endif() endif()
# Optional dependency for some tests # Optional dependency for some tests (boost::variant is only supported with version >= 1.56)
find_package(Boost) find_package(Boost 1.56)
# Compile with compiler warnings turned on # Compile with compiler warnings turned on
function(pybind11_enable_warnings target_name) function(pybind11_enable_warnings target_name)

2
tests/test_stl.cpp
View File

@ -13,7 +13,7 @@
// Test with `std::variant` in C++17 mode, or with `boost::variant` in C++11/14 // Test with `std::variant` in C++17 mode, or with `boost::variant` in C++11/14
#if PYBIND11_HAS_VARIANT #if PYBIND11_HAS_VARIANT
using std::variant; using std::variant;
#elif PYBIND11_TEST_BOOST #elif defined(PYBIND11_TEST_BOOST) && (!defined(_MSC_VER) || _MSC_VER >= 1910)
# include <boost/variant.hpp> # include <boost/variant.hpp>
# define PYBIND11_HAS_VARIANT 1 # define PYBIND11_HAS_VARIANT 1
using boost::variant; using boost::variant;