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: PROTON-1403: apply warning compile flags to proactor sources.
Date Mon, 06 Mar 2017 23:20:32 GMT
PROTON-1403: apply warning compile flags to proactor sources.


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

Branch: refs/heads/master
Commit: 1600957917424967a7cb7dd038fecd98f375e051
Parents: c9ee24a
Author: Alan Conway <aconway@redhat.com>
Authored: Mon Mar 6 17:56:11 2017 -0500
Committer: Alan Conway <aconway@redhat.com>
Committed: Mon Mar 6 17:56:11 2017 -0500

----------------------------------------------------------------------
 proton-c/CMakeLists.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/16009579/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index a6e9ef1..4f3430e 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -105,17 +105,6 @@ else(PN_WINAPI)
   set (pn_selector_impl src/reactor/io/posix/selector.c)
 endif(PN_WINAPI)
 
-# Select proactor impl
-find_package(Libuv)
-if (Libuv_FOUND)
-  set (qpid-proton-proactor src/proactor/libuv.c)
-  set (PROACTOR_LIBS ${Libuv_LIBRARIES})
-  set_source_files_properties (${qpid-proton-proactor} PROPERTIES
-    # Skip COMPILE_LANGUAGE_FLAGS, libuv.h won't compile with --std=c99
-    COMPILE_FLAGS "${COMPILE_WARNING_FLAGS} ${LTO} "
-  )
-endif()
-
 # Link in SASL if present
 if (SASL_IMPL STREQUAL cyrus)
   set(pn_sasl_impl src/sasl/sasl.c src/sasl/cyrus_sasl.c)
@@ -293,7 +282,6 @@ set(COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS}" PARENT_SCOPE)
 set(COMPILE_LANGUAGE_FLAGS "${COMPILE_LANGUAGE_FLAGS}" PARENT_SCOPE)
 set(LINK_TIME_OPTIMIZATION "${LTO}" PARENT_SCOPE)
 
-
 if (MSVC)
     set(CMAKE_DEBUG_POSTFIX "d")
     add_definitions(
@@ -482,6 +470,18 @@ set (qpid-proton-include-extra
   include/proton/url.h
 )
 
+# Select proactor sources and build flags
+find_package(Libuv)
+if (Libuv_FOUND)
+  set (qpid-proton-proactor src/proactor/libuv.c)
+  set (PROACTOR_LIBS ${Libuv_LIBRARIES})
+  set_source_files_properties (${qpid-proton-proactor} PROPERTIES
+    # Skip COMPILE_LANGUAGE_FLAGS, libuv.h won't compile with --std=c99
+    COMPILE_FLAGS "${COMPILE_WARNING_FLAGS} ${LTO} "
+  )
+endif()
+
+
 # note: process bindings after the source lists have been defined so
 # the bindings can reference them
 add_subdirectory(bindings)


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


Mime
View raw message