From 06000e16ae00218611baaf171a31550d3458251b Mon Sep 17 00:00:00 2001 From: ltjax Date: Fri, 10 Jan 2020 14:21:09 +0100 Subject: [PATCH] Use CCI boost instead of bincrafters' modular version --- CMakeLists.txt | 2 +- conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d4e7e96..b9da88b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${replay_BINARY_DIR}/build) if(Replay_USE_CONAN) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup(TARGETS) - set(Replay_BOOST_TARGETS CONAN_PKG::boost_math CONAN_PKG::boost_range) + set(Replay_BOOST_TARGETS CONAN_PKG::boost) else() # Replay is typically included in a host project that already has boost if(NOT Boost_FOUND AND NOT DEFINED Replay_BOOST_TARGETS) diff --git a/conanfile.py b/conanfile.py index ed8181e..280980e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -15,7 +15,7 @@ class ReplayConan(ConanFile): default_options = {"shared": False, "use_stb": True, "use_libpng": False} generators = "cmake" exports_sources = "source/*", "test/*", "include/*", "CMakeLists.txt", "replay.natvis" - requires = "boost_math/1.69.0@bincrafters/stable", "boost_numeric_conversion/1.69.0@bincrafters/stable", + requires = "boost/1.71.0", build_requires = "Catch2/2.7.2@catchorg/stable", def _configured_cmake(self):