qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject qpid-proton git commit: PROTON-1403: Add missing qpid-proton-proactor library configuration
Date Fri, 17 Feb 2017 20:14:10 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 6a2316a5d -> d5c0152a7


PROTON-1403: Add missing qpid-proton-proactor library configuration


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d5c0152a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d5c0152a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d5c0152a

Branch: refs/heads/master
Commit: d5c0152a71ea889c4f3688b78dd323e705796c83
Parents: 6a2316a
Author: Alan Conway <aconway@redhat.com>
Authored: Fri Feb 17 14:24:59 2017 -0500
Committer: Alan Conway <aconway@redhat.com>
Committed: Fri Feb 17 15:14:06 2017 -0500

----------------------------------------------------------------------
 proton-c/CMakeLists.txt            | 24 +++++++++++++-----------
 proton-c/src/ProtonConfig.cmake.in |  3 +++
 2 files changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d5c0152a/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 68ccc2c..60e739d 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -576,8 +576,18 @@ if (MSVC)
   include(WindowsC99CheckDef)
 endif(MSVC)
 
+if (qpid-proton-proactor)
+  set(HAS_PROACTOR 1)
+  add_library (
+    qpid-proton-proactor SHARED
+    ${qpid-proton-proactor}
+    )
+  target_link_libraries (qpid-proton-proactor qpid-proton-core ${PROACTOR_LIBS})
+  list(APPEND LIB_TARGETS qpid-proton-proactor)
+endif()
+
 # Install executables and libraries
-install (TARGETS qpid-proton qpid-proton-core
+install(TARGETS qpid-proton qpid-proton-core ${LIB_TARGETS}
   EXPORT  proton
   RUNTIME DESTINATION bin
   ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
@@ -616,17 +626,9 @@ endmacro()
 
 configure_lib(PROTONLIB qpid-proton)
 configure_lib(PROTONCORELIB qpid-proton-core)
-
-if (qpid-proton-proactor)
-  set(HAS_PROACTOR 1)
-  add_library (
-    qpid-proton-proactor SHARED
-    ${qpid-proton-proactor}
-    )
-  target_link_libraries (qpid-proton-proactor qpid-proton-core ${PROACTOR_LIBS})
+if(HAS_PROACTOR)
   configure_lib(PROTONPROACTORLIB qpid-proton-proactor)
-endif()
-
+endif(HAS_PROACTOR)
 
 include(WriteBasicConfigVersionFile)
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d5c0152a/proton-c/src/ProtonConfig.cmake.in
----------------------------------------------------------------------
diff --git a/proton-c/src/ProtonConfig.cmake.in b/proton-c/src/ProtonConfig.cmake.in
index 5e50d7c..6d884f4 100644
--- a/proton-c/src/ProtonConfig.cmake.in
+++ b/proton-c/src/ProtonConfig.cmake.in
@@ -30,4 +30,7 @@ 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 (Proton_FOUND True)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message