You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2021/04/02 20:32:09 UTC

[qpid-proton] branch main updated: PROTON-2355: Fix CMake 2.8.12 incompatibility in the original fix (#305)

This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git


The following commit(s) were added to refs/heads/main by this push:
     new 0ae3bd5  PROTON-2355: Fix CMake 2.8.12 incompatibility in the original fix (#305)
0ae3bd5 is described below

commit 0ae3bd5350191310c3ce2d72fe6be36a602cae4f
Author: Jiri Daněk <jd...@redhat.com>
AuthorDate: Fri Apr 2 22:31:59 2021 +0200

    PROTON-2355: Fix CMake 2.8.12 incompatibility in the original fix (#305)
---
 c/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt
index e1119d1..a7ecf2f 100644
--- a/c/CMakeLists.txt
+++ b/c/CMakeLists.txt
@@ -467,7 +467,7 @@ set(qpid-proton-noncore-src
 add_library (qpid-proton SHARED
   $<TARGET_OBJECTS:qpid-proton-core-objects>
   $<TARGET_OBJECTS:qpid-proton-platform-io-objects>
-  $<$<TARGET_EXISTS:qpid-proton-proactor-objects>:$<TARGET_OBJECTS:qpid-proton-proactor-objects>>
+  $<$<BOOL:${HAS_PROACTOR}>:$<TARGET_OBJECTS:qpid-proton-proactor-objects>>
   ${qpid-proton-noncore-src})
 target_link_libraries (qpid-proton LINK_PRIVATE ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS})
 set_target_properties (qpid-proton
@@ -486,7 +486,7 @@ if (BUILD_STATIC_LIBS)
   target_compile_definitions(qpid-proton-static PUBLIC PROTON_DECLARE_STATIC)
   target_link_libraries (qpid-proton-static
     qpid-proton-core-static
-    $<$<TARGET_EXISTS:qpid-proton-proactor-static>:qpid-proton-proactor-static>
+    $<$<BOOL:${HAS_PROACTOR}>:qpid-proton-proactor-static>
     ${SSL_LIB} ${SASL_LIB} ${TIME_LIB} ${PLATFORM_LIBS} ${PROACTOR_LIBS})
 endif(BUILD_STATIC_LIBS)
 

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