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 2015/08/13 13:47:07 UTC
svn commit: r1695683 - in /qpid/dispatch/trunk: CMakeLists.txt README
src/CMakeLists.txt
Author: tross
Date: Thu Aug 13 11:47:07 2015
New Revision: 1695683
URL: http://svn.apache.org/r1695683
Log:
NO-JIRA - Cleanup of the CMakefiles - Use FindPackage to locate Proton.
Modified:
qpid/dispatch/trunk/CMakeLists.txt
qpid/dispatch/trunk/README
qpid/dispatch/trunk/src/CMakeLists.txt
Modified: qpid/dispatch/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/CMakeLists.txt?rev=1695683&r1=1695682&r2=1695683&view=diff
==============================================================================
--- qpid/dispatch/trunk/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/CMakeLists.txt Thu Aug 13 11:47:07 2015
@@ -23,7 +23,6 @@ set (CMAKE_BUILD_TYPE RelWithDebInfo CAC
if (CMAKE_BUILD_TYPE MATCHES "Deb")
set (has_debug_symbols " (has debug symbols)")
endif (CMAKE_BUILD_TYPE MATCHES "Deb")
-message("Build type is \"${CMAKE_BUILD_TYPE}\"${has_debug_symbols}")
project(qpid-dispatch C)
@@ -84,11 +83,10 @@ set(QPID_DISPATCH_CONFDIR ${SYSCONF_INST
##
## Find dependencies
##
-find_library(proton_lib qpid-proton)
find_library(pthread_lib pthread)
find_library(dl_lib dl)
find_library(rt_lib rt)
-find_path(proton_include proton/version.h)
+find_package(Proton 0.10 REQUIRED)
##
## Find Valgrind
@@ -104,7 +102,7 @@ option(USE_VALGRIND "Use valgrind when r
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}/include
- ${proton_include}
+ ${Proton_INCLUDE_DIRS}
${PYTHON_INCLUDE_PATH}
)
Modified: qpid/dispatch/trunk/README
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/README?rev=1695683&r1=1695682&r2=1695683&view=diff
==============================================================================
--- qpid/dispatch/trunk/README (original)
+++ qpid/dispatch/trunk/README Thu Aug 13 11:47:07 2015
@@ -10,8 +10,8 @@ Dependencies
To build dispatch on a yum-based Linux system, you will need the following
packages installed:
-- qpid-proton-c-devel (0.9 or later)
-- python-qpid-proton (0.9 or later)
+- qpid-proton-c-devel (0.10 or later)
+- python-qpid-proton (0.10 or later)
- cmake
- make
- gcc
@@ -30,7 +30,6 @@ $ mkdir my_build # or directory of yo
$ cd my_build
$ cmake ..
$ make
-$ ctest -VV
Running The Tests
Modified: qpid/dispatch/trunk/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/CMakeLists.txt?rev=1695683&r1=1695682&r2=1695683&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/CMakeLists.txt (original)
+++ qpid/dispatch/trunk/src/CMakeLists.txt Thu Aug 13 11:47:07 2015
@@ -85,7 +85,7 @@ set_property(
)
add_library(qpid-dispatch SHARED ${qpid_dispatch_SOURCES})
-target_link_libraries(qpid-dispatch ${proton_lib} ${pthread_lib} ${rt_lib} ${dl_lib} ${PYTHON_LIBRARIES})
+target_link_libraries(qpid-dispatch ${Proton_LIBRARIES} ${pthread_lib} ${rt_lib} ${dl_lib} ${PYTHON_LIBRARIES})
set_target_properties(qpid-dispatch PROPERTIES
VERSION "${SO_VERSION}"
SOVERSION "${SO_VERSION_MAJOR}"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org