You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2017/05/04 15:48:29 UTC
qpid-proton git commit: NO-JIRA: ProtonConfig.cmake indicates whether
a proactor was built
Repository: qpid-proton
Updated Branches:
refs/heads/master e74b5ca3b -> ed9532e2a
NO-JIRA: ProtonConfig.cmake indicates whether a proactor was built
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/ed9532e2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/ed9532e2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/ed9532e2
Branch: refs/heads/master
Commit: ed9532e2ae08b04aa5690d43e9002431bd019c21
Parents: e74b5ca
Author: Alan Conway <ac...@redhat.com>
Authored: Thu May 4 11:45:32 2017 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu May 4 11:45:32 2017 -0400
----------------------------------------------------------------------
proton-c/CMakeLists.txt | 3 +++
proton-c/src/ProtonConfig.cmake.in | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ed9532e2/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 092f3d4..36e78f1 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -661,6 +661,9 @@ configure_lib(PROTONLIB qpid-proton)
configure_lib(PROTONCORELIB qpid-proton-core)
if(HAS_PROACTOR)
configure_lib(PROTONPROACTORLIB qpid-proton-proactor)
+ # For ProtonConfig.in
+ set(PROTONPROACTOR_INCLUDE_DIRS ${INCLUDEDIR})
+ set(PROTONPROACTOR_LIBRARIES "optimized ${LIBDIR}/${PROTONPROACTORLIB} debug ${LIBDIR}/${PROTONPROACTORLIBDEBUG}")
endif(HAS_PROACTOR)
include(WriteBasicConfigVersionFile)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/ed9532e2/proton-c/src/ProtonConfig.cmake.in
----------------------------------------------------------------------
diff --git a/proton-c/src/ProtonConfig.cmake.in b/proton-c/src/ProtonConfig.cmake.in
index 6d884f4..5a09d68 100644
--- a/proton-c/src/ProtonConfig.cmake.in
+++ b/proton-c/src/ProtonConfig.cmake.in
@@ -30,7 +30,8 @@ set (Proton_LIBRARIES optimized @LIBDIR@/@PROTONLIB@ debug @LIBDIR@/@PROTONL
set (ProtonCore_INCLUDE_DIRS @INCLUDEDIR@)
set (ProtonCore_LIBRARIES optimized @LIBDIR@/@PROTONCORELIB@ debug @LIBDIR@/@PROTONCORELIBDEBUG@)
-set (ProtonProactor_INCLUDE_DIRS @INCLUDEDIR@)
-set (ProtonProactor_LIBRARIES optimized @LIBDIR@/@PROTONPROACTORLIB@ debug @LIBDIR@/@PROTONPROACTORLIBDEBUG@)
+set (ProtonProactor_INCLUDE_DIRS @PROTONPROACTOR_INCLUDE_DIRS@)
+set (ProtonProactor_LIBRARIES @PROTONPROACTOR_LIBRARIES@)
+set (ProtonProactor_FOUND @HAS_PROACTOR@)
set (Proton_FOUND True)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org