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/02/23 22:51:31 UTC
[24/38] qpid-proton git commit: PROTON-1403: Fixes for windows and
platforms without libuv
PROTON-1403: Fixes for windows and platforms without libuv
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/42d5e89e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/42d5e89e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/42d5e89e
Branch: refs/heads/go1
Commit: 42d5e89ef248e5dd85ca892e79696f845c34796f
Parents: 9abc67d
Author: Alan Conway <ac...@redhat.com>
Authored: Thu Feb 16 13:16:30 2017 -0500
Committer: Alan Conway <ac...@redhat.com>
Committed: Thu Feb 16 18:25:21 2017 -0500
----------------------------------------------------------------------
examples/c/proactor/CMakeLists.txt | 5 +----
proton-c/CMakeLists.txt | 1 +
proton-c/src/proactor/libuv.c | 4 ++--
proton-c/src/tests/CMakeLists.txt | 4 +++-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/42d5e89e/examples/c/proactor/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/c/proactor/CMakeLists.txt b/examples/c/proactor/CMakeLists.txt
index 153f35f..bb6cb0f 100644
--- a/examples/c/proactor/CMakeLists.txt
+++ b/examples/c/proactor/CMakeLists.txt
@@ -23,11 +23,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${Proton_INCLUDE_DIRS})
# Check if the proton library has a proactor implementation.
include(CheckFunctionExists)
-include(CMakePushCheckState)
-cmake_push_check_state()
-set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${Proton_LIBRARIES})
+set(CMAKE_REQUIRED_LIBRARIES ${Proton_LIBRARIES})
check_function_exists(pn_proactor HAS_PROACTOR)
-cmake_pop_check_state()
if(HAS_PROACTOR)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/42d5e89e/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 0731b67..68ccc2c 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -618,6 +618,7 @@ 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}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/42d5e89e/proton-c/src/proactor/libuv.c
----------------------------------------------------------------------
diff --git a/proton-c/src/proactor/libuv.c b/proton-c/src/proactor/libuv.c
index 4ec7b03..0a10ac9 100644
--- a/proton-c/src/proactor/libuv.c
+++ b/proton-c/src/proactor/libuv.c
@@ -19,8 +19,6 @@
*
*/
-#include <uv.h>
-
#include <proton/condition.h>
#include <proton/connection_driver.h>
#include <proton/engine.h>
@@ -31,6 +29,8 @@
#include <proton/transport.h>
#include <proton/url.h>
+#include <uv.h>
+
/* All asserts are cheap and should remain in a release build for debugability */
#undef NDEBUG
#include <assert.h>
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/42d5e89e/proton-c/src/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/src/tests/CMakeLists.txt b/proton-c/src/tests/CMakeLists.txt
index 70b30a0..3ad114a 100644
--- a/proton-c/src/tests/CMakeLists.txt
+++ b/proton-c/src/tests/CMakeLists.txt
@@ -49,4 +49,6 @@ pn_add_c_test (c-reactor-tests reactor.c)
pn_add_c_test (c-event-tests event.c)
pn_add_c_test (c-data-tests data.c)
pn_add_c_test (c-condition-tests condition.c)
-pn_add_c_test (c-proactor-tests proactor.c)
+if(HAS_PROACTOR)
+ pn_add_c_test (c-proactor-tests proactor.c)
+endif(HAS_PROACTOR)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org