From 5c8d7a45e3747a9cd770b77776f98a9020dfa099 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 27 Mar 2014 00:25:43 +0000 Subject: QPID-5646: Detect and build against earlier versions of Proton. - This should detect any version of Proton that either uses pkg-config or native cmake config files. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582139 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/CMakeModules/FindProton.cmake | 61 ++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 qpid/cpp/CMakeModules/FindProton.cmake (limited to 'qpid/cpp/CMakeModules') diff --git a/qpid/cpp/CMakeModules/FindProton.cmake b/qpid/cpp/CMakeModules/FindProton.cmake new file mode 100644 index 0000000000..caf836d69a --- /dev/null +++ b/qpid/cpp/CMakeModules/FindProton.cmake @@ -0,0 +1,61 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +include(FindPackageHandleStandardArgs) +include(FindPackageMessage) + +# First try to find the Installed Proton config (Proton 0.7 and later) +find_package(Proton CONFIG QUIET) +if (Proton_FOUND) + find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") + return() +endif () + +# Now look for the cooky Proton config installed with some earlier +# versions of Proton +find_package(proton CONFIG QUIET) +if (proton_FOUND) + include("${proton_DIR}/libqpid-proton.cmake") + set (Proton_VERSION ${PROTON_VERSION}) + set (Proton_INCLUDE_DIRS ${PROTON_INCLUDE_DIRS}) + set (Proton_LIBRARIES ${PROTON_LIBRARIES}) + set (Proton_FOUND true) + find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") + return() +endif () + +# Now look for any pkg-config configuration +find_package(PkgConfig QUIET) + +if (PKG_CONFIG_FOUND) + if (NOT Proton_FIND_VERSION) + pkg_check_modules(Proton libqpid-proton QUIET) + elseif(NOT Proton_FIND_VERSION_EXACT) + pkg_check_modules(Proton libqpid-proton>=${Proton_FIND_VERSION} QUIET) + else() + pkg_check_modules(Proton libqpid-proton=${Proton_FIND_VERSION} QUIET) + endif() + if (Proton_FOUND) + find_package_message(Proton "Found Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_LIBRARIES} $Proton_VERSION") + return() + endif () +endif() + +# Proton not found print a standard error message +find_package_handle_standard_args(Proton CONFIG_MODE) -- cgit v1.2.1 From 5ca94ee652fad46fb9f05642d84e8d3bac00acef Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 27 Mar 2014 05:01:49 +0000 Subject: 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 --- qpid/cpp/CMakeModules/FindProton.cmake | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'qpid/cpp/CMakeModules') 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() -- cgit v1.2.1 From db060e520106b321fcc686d9752b71c8f5cca105 Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 27 Mar 2014 15:01:56 +0000 Subject: QPID-5646: Fixes Proton detection to work with non standard pkg-config location git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1582337 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/CMakeModules/FindProton.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qpid/cpp/CMakeModules') 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 () -- cgit v1.2.1