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 2019/04/03 21:39:17 UTC
[qpid-proton] branch master updated: NO-JIRA: Small CMake changes
to silence some warnings
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new fa7121a NO-JIRA: Small CMake changes to silence some warnings
fa7121a is described below
commit fa7121a4d45fe60fa0155e38fc9f90a940406ada
Author: Andrew Stitcher <as...@apache.org>
AuthorDate: Wed Apr 3 17:38:36 2019 -0400
NO-JIRA: Small CMake changes to silence some warnings
---
CMakeLists.txt | 4 +++-
tests/RuntimeCheck.cmake | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4f06ae..133a69b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ find_package (CyrusSASL)
enable_testing ()
# Set up runtime checks (valgrind, sanitizers etc.)
-include(tests/RuntimeCheck.cmake)
+include(tests/RuntimeCheck.cmake)
## Variables used across components
@@ -334,6 +334,8 @@ if(SWIG_FOUND)
# Add any new swig bindings here - the directory name must be the same as the binding name
list(APPEND BINDINGS python ruby)
+ cmake_policy(SET CMP0078 OLD)
+ cmake_policy(SET CMP0086 OLD)
include(UseSWIG)
# All swig modules should include ${PROTON_HEADERS} in SWIG_MODULE_<name>_EXTRA_DEPS
diff --git a/tests/RuntimeCheck.cmake b/tests/RuntimeCheck.cmake
index 57ae2f5..79aef55 100644
--- a/tests/RuntimeCheck.cmake
+++ b/tests/RuntimeCheck.cmake
@@ -63,7 +63,7 @@ deprecated_enable_check(ENABLE_VALGRIND memcheck "Use valgrind to detect run-tim
deprecated_enable_check(ENABLE_SANITIZERS asan "Compile with memory sanitizers (asan, ubsan)")
deprecated_enable_check(ENABLE_TSAN tsan "Compile with thread sanitizer (tsan)")
-set(RUNTIME_CHECK ${RUNTIME_CHECK_DEFAULT} CACHE string "Enable runtime checks. Valid values: ${runtime_checks}")
+set(RUNTIME_CHECK ${RUNTIME_CHECK_DEFAULT} CACHE STRING "Enable runtime checks. Valid values: ${runtime_checks}")
if(CMAKE_BUILD_TYPE MATCHES "Coverage" AND RUNTIME_CHECK)
message(FATAL_ERROR "Cannot set RUNTIME_CHECK with CMAKE_BUILD_TYPE=Coverage")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org