qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [3/4] qpid-proton git commit: NO-JIRA: Fixed bogus cmake test for existence of proactor in examples
Date Tue, 28 Feb 2017 00:47:19 GMT
NO-JIRA: Fixed bogus cmake test for existence of proactor in examples


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

Branch: refs/heads/master
Commit: 0e81224d3112c018e11ad3e4bc66eca016ef5656
Parents: 13e40e9
Author: Alan Conway <aconway@redhat.com>
Authored: Mon Feb 27 19:15:53 2017 -0500
Committer: Alan Conway <aconway@redhat.com>
Committed: Mon Feb 27 19:45:13 2017 -0500

----------------------------------------------------------------------
 examples/c/proactor/CMakeLists.txt | 5 -----
 proton-c/CMakeLists.txt            | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/0e81224d/examples/c/proactor/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/c/proactor/CMakeLists.txt b/examples/c/proactor/CMakeLists.txt
index bb6cb0f..2cb7ad9 100644
--- a/examples/c/proactor/CMakeLists.txt
+++ b/examples/c/proactor/CMakeLists.txt
@@ -21,11 +21,6 @@ find_package(Proton REQUIRED)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${Proton_INCLUDE_DIRS})
 
-# Check if the proton library has a proactor implementation.
-include(CheckFunctionExists)
-set(CMAKE_REQUIRED_LIBRARIES ${Proton_LIBRARIES})
-check_function_exists(pn_proactor HAS_PROACTOR)
-
 if(HAS_PROACTOR)
 
 add_definitions(${COMPILE_WARNING_FLAGS} ${WERROR} ${COMPILE_PLATFORM_FLAGS} ${LINK_TIME_OPTIMIZATION})

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/0e81224d/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 60e739d..c56c03f 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -578,6 +578,7 @@ endif(MSVC)
 
 if (qpid-proton-proactor)
   set(HAS_PROACTOR 1)
+  set(HAS_PROACTOR 1 PARENT_SCOPE) # Visible to examples
   add_library (
     qpid-proton-proactor SHARED
     ${qpid-proton-proactor}


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


Mime
View raw message