fix-cmake.patch 1.9 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 657a1f4..5092a59 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -72,6 +72,10 @@
  6. cmake_minimum_required (VERSION 3.0.2 FATAL_ERROR)
  7. +if(POLICY CMP0057)
  8. + cmake_policy(SET CMP0057 NEW)
  9. +endif()
  10. +
  11. if (POLICY CMP0042)
  12. cmake_policy (SET CMP0042 NEW)
  13. endif ()
  14. diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
  15. index a512c2a..2fe7844 100644
  16. --- a/cmake/config.cmake.in
  17. +++ b/cmake/config.cmake.in
  18. @@ -36,8 +36,8 @@ set (@PACKAGE_PREFIX@_INCLUDE_DIR "${_INSTALL_PREFIX}/@INCLUDE_INSTALL_DIR@")
  19. if (@PACKAGE_NAME@_FIND_COMPONENTS)
  20. foreach (@PACKAGE_NAME@_FIND_COMPONENT IN LISTS @PACKAGE_NAME@_FIND_COMPONENTS)
  21. - if (@PACKAGE_NAME@_FIND_REQUIRED_${@PACKAGE_NAME@_FIND_COMPONENT} AND NOT TARGET @PACKAGE_NAME@_${@PACKAGE_NAME@_FIND_COMPONENT})
  22. - message (FATAL_ERROR "Package @PACKAGE_NAME@ was installed without required component ${@PACKAGE_NAME@_FIND_COMPONENT}!")
  23. + if (@PACKAGE_NAME@_FIND_REQUIRED_${@PACKAGE_NAME@_FIND_COMPONENT} AND NOT TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_${@PACKAGE_NAME@_FIND_COMPONENT})
  24. + message (FATAL_ERROR "Package @PACKAGE_NAME@ was installed without required component ${@PACKAGE_PREFIX@_TARGET_PREFIX}${@PACKAGE_NAME@_FIND_COMPONENT}!")
  25. endif ()
  26. endforeach ()
  27. list (GET @PACKAGE_NAME@_FIND_COMPONENTS 0 @PACKAGE_NAME@_FIND_COMPONENT)
  28. @@ -78,7 +78,7 @@ if (NOT DEFINED @PACKAGE_PREFIX@_NOTHREADS)
  29. else ()
  30. set (@PACKAGE_PREFIX@_NOTHREADS FALSE)
  31. endif ()
  32. - elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared)
  33. + elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared)
  34. set (@PACKAGE_PREFIX@_NOTHREADS FALSE)
  35. else ()
  36. set (@PACKAGE_PREFIX@_NOTHREADS TRUE)