0001-Revert-Updating-CMake-configuration-file-to-use-vers.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455
  1. From 2cd95289939b4a7c2576176c7f6268028aa093b2 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Fri, 24 May 2019 21:50:16 +0200
  4. Subject: [PATCH] Revert "Updating CMake configuration file to use
  5. version 3.14 as minimum and added boost dependency targets"
  6. This reverts commit 4e4ee999c4b323514c0ba81ab1ff3afb10d2f1cd to avoid
  7. bumping host-cmake requirement version from 3.8 to 3.14 in buildroot.
  8. [Fabrice: Updated for 2020.1]
  9. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  10. ---
  11. CMakeLists.txt | 8 +++-----
  12. 1 file changed, 3 insertions(+), 5 deletions(-)
  13. diff --git a/CMakeLists.txt b/CMakeLists.txt
  14. index c5b7832ff..a21f5b87b 100644
  15. --- a/CMakeLists.txt
  16. +++ b/CMakeLists.txt
  17. @@ -1,5 +1,5 @@
  18. -#set to minimum version that supports clean build
  19. -cmake_minimum_required(VERSION 3.14.0)
  20. +#set to minimum version that supports clean build on cygwin
  21. +cmake_minimum_required(VERSION 2.8.4)
  22. project(domoticz)
  23. @@ -583,6 +583,7 @@ set(Boost_USE_STATIC_LIBS ${USE_STATIC_BOOST})
  24. set(Boost_USE_MULTITHREADED ON)
  25. unset(Boost_INCLUDE_DIR CACHE)
  26. unset(Boost_LIBRARY_DIRS CACHE)
  27. +find_package(Boost REQUIRED COMPONENTS thread system)
  28. if(USE_STATIC_BOOST)
  29. message(STATUS "Linking against boost static libraries")
  30. @@ -590,16 +591,6 @@ else(USE_STATIC_BOOST)
  31. message(STATUS "Linking against boost dynamic libraries")
  32. endif(USE_STATIC_BOOST)
  33. -find_package(Boost REQUIRED COMPONENTS thread system)
  34. -if(Boost_FOUND)
  35. - MESSAGE(STATUS "BOOST libraries found at: ${Boost_LIBRARY_DIRS}")
  36. - MESSAGE(STATUS "Boost includes found at: ${Boost_INCLUDE_DIR}")
  37. -else(Boost_FOUND)
  38. - MESSAGE(FATAL_ERROR "Boost thread/system library not found on your system, try to get this installed.")
  39. -endif(Boost_FOUND)
  40. -
  41. -target_link_libraries(domoticz Boost::thread Boost::system)
  42. -
  43. # compare found vs required libBoost version
  44. if(Boost_VERSION VERSION_LESS DOMO_MIN_LIBBOOST_VERSION)
  45. message(FATAL_ERROR "Found libBoost version ${Boost_VERSION}, ${DOMO_MIN_LIBBOOST_VERSION} or newer required")
  46. --
  47. 2.20.1