summaryrefslogtreecommitdiff
path: root/indra/cmake/Boost.cmake
diff options
context:
space:
mode:
authorNicky <nicky.dasmijn@gmail.com>2022-04-18 18:11:43 +0200
committerNicky <nicky.dasmijn@gmail.com>2022-04-18 18:11:43 +0200
commit2b151e0aefd54671e1be504269f10318d303dccb (patch)
treec1527ef5d23bc946ac8dfcb907d2678a9a96db79 /indra/cmake/Boost.cmake
parentdcfb94fbaca3c66ec02e6873cda53b4afd547beb (diff)
Round one to support conan for 3P packages, this allows to build the viewer on Linux again.
Diffstat (limited to 'indra/cmake/Boost.cmake')
-rw-r--r--indra/cmake/Boost.cmake6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index f4f824769e..601a23a86d 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -2,7 +2,13 @@
include(Prebuilt)
include_guard()
+
add_library( ll::boost INTERFACE IMPORTED )
+if( USE_CONAN )
+ target_link_libraries( ll::boost INTERFACE CONAN_PKG::boost )
+ target_compile_definitions( ll::boost INTERFACE BOOST_ALLOW_DEPRECATED_HEADERS BOOST_BIND_GLOBAL_PLACEHOLDERS )
+ return()
+endif()
use_prebuilt_binary(boost)