Commit c40ef612 by Dean Moldovan

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

parent c14c2762
...@@ -114,8 +114,8 @@ if(PYBIND11_TEST_FILES_EIGEN_I GREATER -1) ...@@ -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)
......
...@@ -13,7 +13,7 @@ ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment