From e41369fbc6dfa8554d6818ec46931c6696330ee7 Mon Sep 17 00:00:00 2001 From: Leonid Yuriev Date: Fri, 27 Sep 2019 11:32:39 +0300 Subject: [PATCH] mdbx-build: minor fix build-info & options. Change-Id: I72020c99a081845a155d7fda2ff30b7907124760 --- CMakeLists.dist-minimal | 2 +- src/CMakeLists.txt | 4 ++-- src/elements/core.c | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.dist-minimal b/CMakeLists.dist-minimal index 90157bc1..6a217506 100644 --- a/CMakeLists.dist-minimal +++ b/CMakeLists.dist-minimal @@ -128,7 +128,7 @@ else() list(APPEND MDBX_BUILD_FLAGS ${CMAKE_C_DEFINES_${CMAKE_BUILD_TYPE_UPPERCASE}}) endif() list(REMOVE_DUPLICATES MDBX_BUILD_FLAGS) -string(REPLACE ";" "" MDBX_BUILD_FLAGS "${MDBX_BUILD_FLAGS}") +string(REPLACE ";" " " MDBX_BUILD_FLAGS "${MDBX_BUILD_FLAGS}") add_definitions(-DMDBX_BUILD_FLAGS="${MDBX_BUILD_FLAGS}") # shared library diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc9ff9b0..7a12cdfe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -153,7 +153,7 @@ if(options_list) endif() list(REMOVE_DUPLICATES MDBX_BUILD_FLAGS) -string(REPLACE ";" "" MDBX_BUILD_FLAGS "${MDBX_BUILD_FLAGS}") +string(REPLACE ";" " " MDBX_BUILD_FLAGS "${MDBX_BUILD_FLAGS}") if(CMAKE_CONFIGURATION_TYPES) # add dynamic part via per-configuration define message(STATUS "MDBX Compile Flags: ${MDBX_BUILD_FLAGS} ") @@ -189,7 +189,7 @@ endif() if(CMAKE_CONFIGURATION_TYPES) add_definitions(-DMDBX_BUILD_CONFIG="$") else() - add_definitions(-DMDBX_BUILD_CONFIG="${CMAKE_BUILD_TYPE}") + set(MDBX_BUILD_CONFIG ${CMAKE_BUILD_TYPE}) endif() # options diff --git a/src/elements/core.c b/src/elements/core.c index 56f0d80c..a5e575f1 100644 --- a/src/elements/core.c +++ b/src/elements/core.c @@ -15287,9 +15287,6 @@ __dll_export #endif /* MDBX_BUILD_CONFIG */ , "MDBX_DEBUG=" STRINGIFY(MDBX_DEBUG) -#ifdef MDBX_CONFIG_H - " MDBX_CONFIG_H=" STRINGIFY(MDBX_CONFIG_H) -#endif /* MDBX_CONFIG_H */ " MDBX_WORDBITS=" STRINGIFY(MDBX_WORDBITS) " BYTE_ORDER=" #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__