From 42f8154c395bbe98198cb2d7866a6da21a540357 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Fri, 25 Oct 2019 08:10:15 +0300 Subject: [PATCH] mdbx-cmake: rename MDBX_USE_VALGRIND option. Change-Id: I985befb6c60e8a8c8db1b5d9dd085eb4645b038b --- CMakeLists.txt | 2 +- cmake/profile.cmake | 6 +++--- src/elements/config.h.in | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6aa56471..75e9b3b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -294,7 +294,7 @@ message(STATUS "Use C${MDBX_C_STANDARD} for libmdbx") # #### # # # #### # # #### # -set(MDBX_BUILD_OPTIONS ENABLE_ASAN ENABLE_VALGRIND ENABLE_GPROF ENABLE_GCOV) +set(MDBX_BUILD_OPTIONS ENABLE_ASAN MDBX_USE_VALGRIND ENABLE_GPROF ENABLE_GCOV) add_mdbx_option(MDBX_BUILD_SHARED_LIBRARY "Build libmdbx as shared library (DLL)" ${BUILD_SHARED_LIBS}) add_mdbx_option(MDBX_ALLOY_BUILD "Build MDBX library as single object file" ON) add_mdbx_option(MDBX_TXN_CHECKOWNER "Checking transaction matches the calling thread inside libmdbx's API" ON) diff --git a/cmake/profile.cmake b/cmake/profile.cmake index 22185c9e..6507e8dd 100644 --- a/cmake/profile.cmake +++ b/cmake/profile.cmake @@ -34,9 +34,9 @@ else() check_include_file(valgrind/memcheck.h HAVE_VALGRIND_MEMCHECK_H) endif() -option(ENABLE_VALGRIND "Enable integration with valgrind, a memory analyzing tool" OFF) -if(ENABLE_VALGRIND AND NOT HAVE_VALGRIND_MEMCHECK_H) - message(FATAL_ERROR "ENABLE_VALGRIND option is set but valgrind/memcheck.h is not found") +option(MDBX_USE_VALGRIND "Enable integration with valgrind, a memory analyzing tool" OFF) +if(MDBX_USE_VALGRIND AND NOT HAVE_VALGRIND_MEMCHECK_H) + message(FATAL_ERROR "MDBX_USE_VALGRIND option is set but valgrind/memcheck.h is not found") endif() option(ENABLE_ASAN diff --git a/src/elements/config.h.in b/src/elements/config.h.in index fdd3cac1..44ae1507 100644 --- a/src/elements/config.h.in +++ b/src/elements/config.h.in @@ -8,7 +8,7 @@ #cmakedefine HAS_RELAXED_CONSTEXPR #cmakedefine LTO_ENABLED -#cmakedefine ENABLE_VALGRIND +#cmakedefine MDBX_USE_VALGRIND #cmakedefine ENABLE_GPROF #cmakedefine ENABLE_GCOV #cmakedefine ENABLE_ASAN