You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2017/10/04 14:41:03 UTC
qpid-proton git commit: PROTON-1609: Fix C++ example flags
Repository: qpid-proton
Updated Branches:
refs/heads/master 6e1bbe835 -> aece4ad2f
PROTON-1609: Fix C++ example flags
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/aece4ad2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/aece4ad2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/aece4ad2
Branch: refs/heads/master
Commit: aece4ad2f4e4eb2d141020c59c393a30a79f53a9
Parents: 6e1bbe8
Author: Andrew Stitcher <as...@apache.org>
Authored: Wed Oct 4 10:40:31 2017 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Oct 4 10:40:31 2017 -0400
----------------------------------------------------------------------
proton-c/CMakeLists.txt | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/aece4ad2/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 0711aa8..1a50139 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -300,11 +300,10 @@ if (CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_COMPILER_IS_GNUCC)
# Ensure that examples build with c90, to deal with older c++03-as-c compilers.
set(C_EXAMPLE_FLAGS "-std=c90 -pedantic")
endif()
-set(C_EXAMPLE_FLAGS "${C_EXAMPLE_FLAGS} ${COMPILE_WARNING_FLAGS} ${CMAKE_C_FLAGS}")
-set(CXX_EXAMPLE_FLAGS ${CXX_WARNING_FLAGS} ${CMAKE_CXX_FLAGS})
+
# Set example flags in parent scope so example/CMakefile can read them.
-set(C_EXAMPLE_FLAGS ${C_EXAMPLE_FLAGS} PARENT_SCOPE)
-set(CXX_EXAMPLE_FLAGS ${CXX_EXAMPLE_FLAGS} PARENT_SCOPE)
+set(C_EXAMPLE_FLAGS "${C_EXAMPLE_FLAGS} ${COMPILE_WARNING_FLAGS} ${CMAKE_C_FLAGS}" PARENT_SCOPE)
+set(CXX_EXAMPLE_FLAGS "${CXX_WARNING_FLAGS} ${CMAKE_CXX_FLAGS}" PARENT_SCOPE)
if (MSVC)
set(CMAKE_DEBUG_POSTFIX "d")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org