summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2014-03-27 16:29:21 +0000
committerAndrew Stitcher <astitcher@apache.org>2014-03-27 16:29:21 +0000
commit5cb81aaefba2f0627d96a62ea5706f23bf2e1011 (patch)
treea93d32df0a9456ddc9fe9b075907c4a0bd3d0cd3
parent332edbfbe7ad9267bb7148cb3ffeaeb306c8124b (diff)
downloadqpid-python-5cb81aaefba2f0627d96a62ea5706f23bf2e1011.tar.gz
QPID-5646: Fixes Proton detection to work with non standard pkg-config location
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.28@1582381 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/CMakeModules/FindProton.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/qpid/cpp/CMakeModules/FindProton.cmake b/qpid/cpp/CMakeModules/FindProton.cmake
index c5ab2d6c77..e6eae5d9d9 100644
--- a/qpid/cpp/CMakeModules/FindProton.cmake
+++ b/qpid/cpp/CMakeModules/FindProton.cmake
@@ -57,6 +57,8 @@ if (PKG_CONFIG_FOUND)
pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton=${Proton_FIND_VERSION})
endif()
if (Proton_FOUND)
+ find_library(Proton_LIBRARY ${Proton_LIBRARIES} HINTS ${Proton_LIBRARY_DIRS})
+ set (Proton_LIBRARIES ${Proton_LIBRARY})
find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION")
return()
endif ()