0002-boost-fallback-only-check-for-boost-if-really-needed.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536
  1. From 24e7adc8d67b3c8f7d275b4f9a7e70a61b73fcd4 Mon Sep 17 00:00:00 2001
  2. From: Peter Seiderer <ps.report@gmx.net>
  3. Date: Fri, 28 Jan 2022 13:11:01 +0100
  4. Subject: [PATCH] boost-fallback: only check for boost if really needed
  5. - only check for boost if really needed (in case of legacy c++ standard < c++17)
  6. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  7. ---
  8. src/cmake/boost-fallback/boost-fallback.cmake | 3 +++
  9. 1 file changed, 3 insertions(+)
  10. diff --git a/src/cmake/boost-fallback/boost-fallback.cmake b/src/cmake/boost-fallback/boost-fallback.cmake
  11. index 8285b0b9..0ecf8c6c 100644
  12. --- a/src/cmake/boost-fallback/boost-fallback.cmake
  13. +++ b/src/cmake/boost-fallback/boost-fallback.cmake
  14. @@ -55,6 +55,8 @@ try_compile(STD_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tes
  15. try_compile(STD_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
  16. "${CMAKE_CURRENT_LIST_DIR}/test-stdatomic.cpp")
  17. +# search for boost only in case needed for legacy c++ standard < c++17
  18. +if(NOT ${STD_THREAD_FOUND} OR NOT ${STD_MUTEX_FOUND} OR NOT ${STD_SHARED_MUTEX_FOUND} OR NOT ${STD_SHARED_PTR_FOUND} OR NOT ${STD_ATOMIC_FOUND})
  19. find_package(Boost COMPONENTS thread)
  20. if( ${Boost_FOUND} )
  21. try_compile(Boost_SHARED_PTR_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
  22. @@ -67,6 +69,7 @@ if( ${Boost_FOUND} )
  23. try_compile(Boost_ATOMIC_FOUND "${CMAKE_BINARY_DIR}/boost-fallback-compile-tests"
  24. "${CMAKE_CURRENT_LIST_DIR}/test-boostatomic.cpp")
  25. endif( ${Boost_FOUND} )
  26. +endif()
  27. # Link the target with the appropriate boost libraries(if required)
  28. function(boostfallback_link target)
  29. --
  30. 2.34.1