Use CCI boost instead of bincrafters' modular version

ltjax · Jan 10, 2020 · 06000e1 · 06000e1
1 parent 306f913
commit 06000e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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):