You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2017/05/11 12:52:20 UTC
qpid-dispatch git commit: NO-JIRA - Update CMakeLists files to use
new Proton Core and Proactor packages
Repository: qpid-dispatch
Updated Branches:
refs/heads/master d5aedafe4 -> 340538d71
NO-JIRA - Update CMakeLists files to use new Proton Core and Proactor packages
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/340538d7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/340538d7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/340538d7
Branch: refs/heads/master
Commit: 340538d717aada7aca8ee82460633baa86057c1a
Parents: d5aedaf
Author: Ted Ross <tr...@redhat.com>
Authored: Thu May 11 08:51:13 2017 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Thu May 11 08:51:13 2017 -0400
----------------------------------------------------------------------
CMakeLists.txt | 8 +++-----
src/CMakeLists.txt | 4 ++--
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/340538d7/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f60f5a5..0abccd7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,10 +100,7 @@ endif (NOT COMMAND add_compile_options)
find_library(pthread_lib pthread)
find_library(dl_lib dl)
find_library(rt_lib rt)
-find_package(Proton 0.15 REQUIRED)
-if (NOT ProtonProactor_FOUND)
- message(FATAL_ERROR "Proton library does not provide a proactor")
-endif()
+find_package(Proton REQUIRED Core Proactor)
## Optional dependencies
include(FindLibWebSockets)
@@ -129,7 +126,8 @@ set(TEST_RUNNER "${VG_RUNNER}" CACHE STRING "Program to run test executables")
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}/include
- ${Proton_INCLUDE_DIRS}
+ ${Proton_Proactor_INCLUDE_DIRS}
+ ${Proton_Core_INCLUDE_DIRS}
${PYTHON_INCLUDE_PATH}
)
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/340538d7/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2a570e6..10cd7c6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -120,9 +120,9 @@ endif (CMAKE_C_COMPILER_ID STREQUAL "GNU")
add_library(qpid-dispatch SHARED ${qpid_dispatch_SOURCES})
if(NOT LIBWEBSOCKETS_FOUND)
-target_link_libraries(qpid-dispatch ${ProtonCore_LIBRARIES} ${ProtonProactor_LIBRARIES} ${pthread_lib} ${rt_lib} ${dl_lib} ${PYTHON_LIBRARIES})
+target_link_libraries(qpid-dispatch ${Proton_Core_LIBRARIES} ${Proton_Proactor_LIBRARIES} ${pthread_lib} ${rt_lib} ${dl_lib} ${PYTHON_LIBRARIES})
else()
-target_link_libraries(qpid-dispatch ${ProtonCore_LIBRARIES} ${ProtonProactor_LIBRARIES} ${pthread_lib} ${rt_lib} ${dl_lib} ${PYTHON_LIBRARIES} ${LIBWEBSOCKETS_LIBRARIES})
+target_link_libraries(qpid-dispatch ${Proton_Core_LIBRARIES} ${Proton_Proactor_LIBRARIES} ${pthread_lib} ${rt_lib} ${dl_lib} ${PYTHON_LIBRARIES} ${LIBWEBSOCKETS_LIBRARIES})
endif()
set_target_properties(qpid-dispatch PROPERTIES
LINK_FLAGS "${CATCH_UNDEFINED}"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org