You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2018/03/14 20:50:39 UTC
[05/14] qpid-cpp git commit: QPID-8128: Link to libqpid-proton-core,
not libqpid-proton; remove an obsolete way to find the proton config
QPID-8128: Link to libqpid-proton-core, not libqpid-proton; remove an obsolete way to find the proton config
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/b18583a6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/b18583a6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/b18583a6
Branch: refs/heads/master
Commit: b18583a6c05d0bb8cb9502f0823d902e17b2410e
Parents: 24c4a37
Author: Justin Ross <jr...@apache.org>
Authored: Mon Mar 12 11:32:28 2018 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Wed Mar 14 10:46:27 2018 -0700
----------------------------------------------------------------------
CMakeModules/FindProton.cmake | 33 ++++++++++-----------------------
src/CMakeLists.txt | 2 +-
src/amqp.cmake | 2 +-
3 files changed, 12 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/b18583a6/CMakeModules/FindProton.cmake
----------------------------------------------------------------------
diff --git a/CMakeModules/FindProton.cmake b/CMakeModules/FindProton.cmake
index 71441fe..e1cb0ed 100644
--- a/CMakeModules/FindProton.cmake
+++ b/CMakeModules/FindProton.cmake
@@ -23,20 +23,7 @@ include(FindPackageMessage)
# First try to find the Installed Proton config (Proton 0.7 and later)
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()
-endif ()
-
-# Now look for the cooky Proton config installed with some earlier
-# versions of Proton
-find_package(proton QUIET NO_MODULE)
-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")
+ find_package_message(Proton "Found Proton: ${Proton_Core_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_Core_LIBRARIES} $Proton_VERSION")
return()
endif ()
@@ -50,16 +37,16 @@ if (PKG_CONFIG_FOUND)
endif()
if (NOT Proton_FIND_VERSION)
- pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton)
+ pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton-core)
elseif(NOT Proton_FIND_VERSION_EXACT)
- pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton>=${Proton_FIND_VERSION})
+ pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton-core>=${Proton_FIND_VERSION})
else()
- pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton=${Proton_FIND_VERSION})
+ pkg_check_modules(Proton ${FindPkgQUIET} libqpid-proton-core=${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")
+ find_library(Proton_LIBRARY ${Proton_Core_LIBRARIES} HINTS ${Proton_LIBRARY_DIRS})
+ set (Proton_Core_LIBRARIES ${Proton_LIBRARY})
+ find_package_message(Proton "Found Proton: ${Proton_Core_LIBRARIES} (found version \"${Proton_VERSION}\")" "$Proton_DIR ${Proton_Core_LIBRARIES} $Proton_VERSION")
return()
endif ()
endif()
@@ -68,11 +55,11 @@ endif()
# Defaule location is ${HOME}/qpid-proton
set(Proton_CHECKOUT_DIR "$ENV{HOME}/qpid-proton" CACHE PATH "Proton checkout directory")
set(Proton_BUILD_DIR_NAME "build" CACHE STRING "Proton build directory name within Proton_CHECKOUT_DIR")
-if (EXISTS ${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton.so)
+if (EXISTS ${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton-core.so)
include("${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/ProtonConfig.cmake")
set (Proton_INCLUDE_DIRS "${Proton_CHECKOUT_DIR}/proton-c/include" "${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/include")
- set (Proton_LIBRARIES "${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton.so")
- find_package_message(Proton "Found uninstalled Proton: ${Proton_LIBRARIES} (found version \"${Proton_VERSION}\")" "$ProtonX_DIR ${Proton_LIBRARIES} $Proton_VERSION")
+ set (Proton_Core_LIBRARIES "${Proton_CHECKOUT_DIR}/${Proton_BUILD_DIR_NAME}/proton-c/libqpid-proton-core.so")
+ find_package_message(Proton "Found uninstalled Proton: ${Proton_Core_LIBRARIES} (found version \"${Proton_VERSION}\")" "$ProtonX_DIR ${Proton_Core_LIBRARIES} $Proton_VERSION")
return()
endif ()
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/b18583a6/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ee474f..44a39b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1001,7 +1001,7 @@ set (qpidmessaging_SOURCES
add_msvc_version (qpidmessaging library dll)
add_library (qpidmessaging SHARED ${qpidmessaging_SOURCES})
-target_link_libraries (qpidmessaging qpidtypes qpidclient qpidcommon ${Proton_LIBRARIES})
+target_link_libraries (qpidmessaging qpidtypes qpidclient qpidcommon ${Proton_Core_LIBRARIES})
set_target_properties (qpidmessaging PROPERTIES
LINK_FLAGS "${HIDE_SYMBOL_FLAGS} ${LINK_VERSION_SCRIPT_FLAG}"
COMPILE_FLAGS "${HIDE_SYMBOL_FLAGS}"
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/b18583a6/src/amqp.cmake
----------------------------------------------------------------------
diff --git a/src/amqp.cmake b/src/amqp.cmake
index 0488340..fc97e22 100644
--- a/src/amqp.cmake
+++ b/src/amqp.cmake
@@ -104,7 +104,7 @@ if (BUILD_AMQP)
include_directories(${Proton_INCLUDE_DIRS})
add_library (amqp MODULE ${amqp_SOURCES})
- target_link_libraries (amqp qpidtypes qpidbroker qpidcommon ${Proton_LIBRARIES})
+ target_link_libraries (amqp qpidtypes qpidbroker qpidcommon ${Proton_Core_LIBRARIES})
set_target_properties (amqp PROPERTIES
PREFIX "")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org