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 2018/01/08 18:22:41 UTC
qpid-proton git commit: PROTON-1653: [C++ binding] Fix C++03 AND
C++11 library builds - Really
Repository: qpid-proton
Updated Branches:
refs/heads/master bfbc211ab -> b95f752ab
PROTON-1653: [C++ binding] Fix C++03 AND C++11 library builds
- Really
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/b95f752a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/b95f752a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/b95f752a
Branch: refs/heads/master
Commit: b95f752ab02edbf4cc21f08514b9e124c3738236
Parents: bfbc211
Author: Andrew Stitcher <as...@apache.org>
Authored: Mon Jan 8 13:01:53 2018 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Mon Jan 8 13:01:53 2018 -0500
----------------------------------------------------------------------
proton-c/bindings/cpp/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/b95f752a/proton-c/bindings/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/CMakeLists.txt b/proton-c/bindings/cpp/CMakeLists.txt
index 44d61a4..a871d0a 100644
--- a/proton-c/bindings/cpp/CMakeLists.txt
+++ b/proton-c/bindings/cpp/CMakeLists.txt
@@ -33,6 +33,8 @@ if (DEFINED CMAKE_CXX_COMPILE_FEATURES)
set(CMAKE_CXX_EXTENSIONS OFF)
if (MSVC) # Compiler feature checks only needed for Visual Studio in this case
include(cpp.cmake)
+ elseif (STD EQUAL 11)
+ set(CPP_DEFINITIONS "HAS_CPP11")
endif()
else ()
if (BUILD_CPP_03)
@@ -44,7 +46,7 @@ else ()
check_cxx_compiler_flag("-std=c++0x" ACCEPTS_CXX0X)
if (ACCEPTS_CXX11)
set(CXX_STANDARD "-std=c++11")
- set (CPP_DEFINITIONS "HAS_CPP11")
+ set(CPP_DEFINITIONS "HAS_CPP11")
elseif(ACCEPTS_CXX0X)
set(CXX_STANDARD "-std=c++0x")
include(cpp.cmake) # Compiler checks needed for C++0x as not all C++11 may be supported
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org