| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 5effba0d7d47071a3f1bca56823190d5a95bb1a6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jackie Huang <jackie.huang@windriver.com> |
| 3 | Date: Wed, 12 Nov 2014 03:09:10 -0500 |
| 4 | Subject: [PATCH] configure.cmake: fix valgrind |
| 5 | |
| 6 | Check valgrind headers only if WITH_VALGRIND is set. |
| 7 | |
| 8 | mariadb uses two macros for valgrind compilations: |
| 9 | HAVE_valgrind - valgrind is installed and can be set by configure option -DWITH_VALGRIND |
| 10 | HAVE_VALGRIND - valgrind debug libraries is installed, set by auto check |
| 11 | |
| 12 | We would like to set them both by the configure option so that we can use |
| 13 | PACKAGECONFIG to decide if valgrind is needed or not. |
| 14 | |
| 15 | Upstream-Status: Inappropriate [oe specific] |
| 16 | |
| 17 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| 18 | --- |
| 19 | configure.cmake | 4 ++-- |
| 20 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 21 | |
| 22 | diff --git a/configure.cmake b/configure.cmake |
| 23 | index 0bd7bbe..51a098f 100644 |
| 24 | --- a/configure.cmake |
| 25 | +++ b/configure.cmake |
| 26 | @@ -1047,10 +1047,10 @@ MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY) |
| 27 | |
| 28 | IF(WITH_VALGRIND) |
| 29 | SET(HAVE_valgrind 1) |
| 30 | + CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" |
| 31 | + HAVE_VALGRIND) |
| 32 | ENDIF() |
| 33 | |
| 34 | -CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" |
| 35 | - HAVE_VALGRIND) |
| 36 | |
| 37 | #-------------------------------------------------------------------- |
| 38 | # Check for IPv6 support |
| 39 | -- |
| 40 | 2.0.0 |
| 41 | |