diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2014-03-27 05:01:49 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2014-03-27 05:01:49 +0000 |
| commit | 5ca94ee652fad46fb9f05642d84e8d3bac00acef (patch) | |
| tree | d2e6da7c84885a1959605a10bd4f74137923152c | |
| parent | 5c8d7a45e3747a9cd770b77776f98a9020dfa099 (diff) | |
| download | qpid-python-5ca94ee652fad46fb9f05642d84e8d3bac00acef.tar.gz | |
QPID-5646: Fixes Proton detection to work with cmake 2.6
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582187 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/CMakeModules/FindProton.cmake | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/qpid/cpp/CMakeModules/FindProton.cmake b/qpid/cpp/CMakeModules/FindProton.cmake index caf836d69a..c5ab2d6c77 100644 --- a/qpid/cpp/CMakeModules/FindProton.cmake +++ b/qpid/cpp/CMakeModules/FindProton.cmake @@ -21,7 +21,7 @@ include(FindPackageHandleStandardArgs) include(FindPackageMessage) # First try to find the Installed Proton config (Proton 0.7 and later) -find_package(Proton CONFIG QUIET) +find_package(Proton QUIET NO_MODULE) if (Proton_FOUND) find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") return() @@ -29,7 +29,7 @@ endif () # Now look for the cooky Proton config installed with some earlier # versions of Proton -find_package(proton CONFIG QUIET) +find_package(proton QUIET NO_MODULE) if (proton_FOUND) include("${proton_DIR}/libqpid-proton.cmake") set (Proton_VERSION ${PROTON_VERSION}) @@ -44,12 +44,17 @@ endif () find_package(PkgConfig QUIET) if (PKG_CONFIG_FOUND) + # Check for cmake 2.6 + if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.0") + set (FindPkgQUIET QUIET) + endif() + if (NOT Proton_FIND_VERSION) - pkg_check_modules(Proton libqpid-proton QUIET) + pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton) elseif(NOT Proton_FIND_VERSION_EXACT) - pkg_check_modules(Proton libqpid-proton>=${Proton_FIND_VERSION} QUIET) + pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton>=${Proton_FIND_VERSION}) else() - pkg_check_modules(Proton libqpid-proton=${Proton_FIND_VERSION} QUIET) + pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton=${Proton_FIND_VERSION}) endif() if (Proton_FOUND) find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") @@ -58,4 +63,6 @@ if (PKG_CONFIG_FOUND) endif() # Proton not found print a standard error message -find_package_handle_standard_args(Proton CONFIG_MODE) +if (NOT ${CMAKE_VERSION} VERSION_LESS "2.8.0") + find_package_handle_standard_args(Proton CONFIG_MODE) +endif() |