parent
e7ba897496
commit
92b40d1dc8
@ -1,55 +0,0 @@
|
|||||||
From 133a1c350c949c5f997706c1b7f71e24559b6718 Mon Sep 17 00:00:00 2001
|
|
||||||
From: vagrant <vagrant@localhost.localdomain>
|
|
||||||
Date: Thu, 29 Nov 2018 22:34:01 +0000
|
|
||||||
Subject: [PATCH] PROTON-1974: Correctly detect libraries with earlier versions
|
|
||||||
of CMake
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Patch-from: Jiri Daněk
|
|
||||||
---
|
|
||||||
tools/cmake/Modules/FindCyrusSASL.cmake | 1 +
|
|
||||||
tools/cmake/Modules/FindJsonCpp.cmake | 1 +
|
|
||||||
tools/cmake/Modules/FindLibuv.cmake | 1 +
|
|
||||||
3 files changed, 3 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/tools/cmake/Modules/FindCyrusSASL.cmake b/tools/cmake/Modules/FindCyrusSASL.cmake
|
|
||||||
index ebd0eab..eeb3dbf 100644
|
|
||||||
--- a/tools/cmake/Modules/FindCyrusSASL.cmake
|
|
||||||
+++ b/tools/cmake/Modules/FindCyrusSASL.cmake
|
|
||||||
@@ -47,6 +47,7 @@ set (CyrusSASL_VERSION ${PC_CyrusSASL_VERSION})
|
|
||||||
|
|
||||||
include (FindPackageHandleStandardArgs)
|
|
||||||
find_package_handle_standard_args (CyrusSASL
|
|
||||||
+ FOUND_VAR CyrusSASL_FOUND
|
|
||||||
REQUIRED_VARS CyrusSASL_LIBRARY CyrusSASL_INCLUDE_DIR
|
|
||||||
VERSION_VAR CyrusSASL_VERSION
|
|
||||||
)
|
|
||||||
diff --git a/tools/cmake/Modules/FindJsonCpp.cmake b/tools/cmake/Modules/FindJsonCpp.cmake
|
|
||||||
index 083d3fc..242718d 100644
|
|
||||||
--- a/tools/cmake/Modules/FindJsonCpp.cmake
|
|
||||||
+++ b/tools/cmake/Modules/FindJsonCpp.cmake
|
|
||||||
@@ -49,6 +49,7 @@ set(JsonCpp_VERSION ${PC_JsonCpp_VERSION})
|
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
|
||||||
find_package_handle_standard_args(JsonCpp
|
|
||||||
+ FOUND_VAR JsonCpp_FOUND
|
|
||||||
REQUIRED_VARS JsonCpp_LIBRARY JsonCpp_INCLUDE_DIR
|
|
||||||
VERSION_VAR JsonCpp_VERSION)
|
|
||||||
|
|
||||||
diff --git a/tools/cmake/Modules/FindLibuv.cmake b/tools/cmake/Modules/FindLibuv.cmake
|
|
||||||
index 422e124..e38cfaf 100644
|
|
||||||
--- a/tools/cmake/Modules/FindLibuv.cmake
|
|
||||||
+++ b/tools/cmake/Modules/FindLibuv.cmake
|
|
||||||
@@ -49,6 +49,7 @@ set(Libuv_VERSION ${PC_Libuv_VERSION})
|
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
|
||||||
find_package_handle_standard_args(Libuv
|
|
||||||
+ FOUND_VAR Libuv_FOUND
|
|
||||||
REQUIRED_VARS Libuv_LIBRARY Libuv_INCLUDE_DIR
|
|
||||||
VERSION_VAR Libuv_VERSION)
|
|
||||||
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
@ -1 +1 @@
|
|||||||
SHA512 (qpid-proton-0.26.0.tar.gz) = e7c028aa4cabb0925c9e6f648a9c9fcfcbb66102aa4e1a82aa801153491db211c5154f95d21928a9c80cb5ef18f0038df0036fbb880ea6083f1b8cc91bd1e888
|
SHA512 (qpid-proton-0.28.0.tar.gz) = 98c82db9a13543f81ccf0b5d6e4d2f18cb8446016969f3582fb7a50604a189b27c124eb9899887ba10405cce5d9ccb65fa385d57c60a511e5e067b77d74a3fa1
|
||||||
|
Loading…
Reference in new issue