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/10/16 12:23:18 UTC

qpid-proton git commit: NO-JIRA: [cmake] Remove C++ flags before running C compile tests

Repository: qpid-proton
Updated Branches:
  refs/heads/master 1ad1e656f -> e238bb6c6


NO-JIRA: [cmake] Remove C++ flags before running C compile tests


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

Branch: refs/heads/master
Commit: e238bb6c63b75ddef6ff581317536b0506c0f2ac
Parents: 1ad1e65
Author: Alan Conway <ac...@redhat.com>
Authored: Mon Oct 16 13:22:47 2017 +0100
Committer: Alan Conway <ac...@redhat.com>
Committed: Mon Oct 16 13:22:47 2017 +0100

----------------------------------------------------------------------
 proton-c/bindings/cpp/cpp.cmake | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e238bb6c/proton-c/bindings/cpp/cpp.cmake
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/cpp.cmake b/proton-c/bindings/cpp/cpp.cmake
index 2c8f296..447dbad 100644
--- a/proton-c/bindings/cpp/cpp.cmake
+++ b/proton-c/bindings/cpp/cpp.cmake
@@ -63,6 +63,7 @@ macro(cxx_compile_checks)
     cxx_test("#include <thread>\nstd::thread t; int main(int, char**) { return 0; }" STD_THREAD)
     cxx_test("#include <mutex>\nstd::mutex m; int main(int, char**) { return 0; }" STD_MUTEX)
     cxx_test("#include <atomic>\nstd::atomic<int> a; int main(int, char**) { return 0; }" STD_ATOMIC)
+    unset(CMAKE_REQUIRED_FLAGS) # Don't contaminate later C tests with C++ flags
   endif()
 endmacro()
 


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