Skip to content

Commit 0639766

Browse files
committed
+3
1 parent 190d245 commit 0639766

File tree

11 files changed

+53
-45
lines changed

11 files changed

+53
-45
lines changed

CMakeLists.txt

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#
1414
# The next version is under active non-public development and will be released as MithrilDB and libmithrildb for
1515
# libraries & packages. Admittedly mythical Mithril is resembling silver but being stronger and lighter than steel.
16-
# Therefore MithrilDB is rightly relevant name.
17-
# MithrilDB will be radically different from libmdbx by the new database format and API based on C++20.
18-
# The goal of this revolution is to provide a clearer and robust API, add more features and new valuable properties.
16+
# Therefore MithrilDB is rightly relevant name. MithrilDB will be radically different from libmdbx by the new database
17+
# format and API based on C++20. The goal of this revolution is to provide a clearer and robust API, add more features
18+
# and new valuable properties.
1919

2020
if(CMAKE_VERSION VERSION_LESS 3.8.2)
2121
cmake_minimum_required(VERSION 3.0.2)
@@ -54,23 +54,23 @@ endif()
5454
cmake_policy(SET CMP0054 NEW)
5555

5656
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.json"
57-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT"
58-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
59-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/NOTICE"
60-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
61-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/GNUmakefile"
62-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx.c"
63-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx.c++"
64-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx.h"
65-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx.h++"
66-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_chk.c"
67-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_copy.c"
68-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_dump.c"
69-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_load.c"
70-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_stat.c"
71-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_drop.c"
72-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ntdll.def"
73-
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/config.h.in")
57+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/COPYRIGHT"
58+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
59+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/NOTICE"
60+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
61+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/GNUmakefile"
62+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx.c"
63+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx.c++"
64+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx.h"
65+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx.h++"
66+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_chk.c"
67+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_copy.c"
68+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_dump.c"
69+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_load.c"
70+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_stat.c"
71+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_drop.c"
72+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ntdll.def"
73+
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/config.h.in")
7474
set(MDBX_AMALGAMATED_SOURCE TRUE)
7575
set(MDBX_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
7676
else()
@@ -130,8 +130,7 @@ endif()
130130
# Try to find a C++ compiler unless sure that this is unnecessary.
131131
if(NOT CMAKE_CXX_COMPILER_LOADED)
132132
include(CheckLanguage)
133-
if(NOT (DEFINED MDBX_BUILD_CXX AND NOT MDBX_BUILD_CXX)
134-
OR NOT (DEFINED MDBX_ENABLE_TESTS AND NOT MDBX_ENABLE_TESTS))
133+
if(NOT (DEFINED MDBX_BUILD_CXX AND NOT MDBX_BUILD_CXX) OR NOT (DEFINED MDBX_ENABLE_TESTS AND NOT MDBX_ENABLE_TESTS))
135134
check_language(CXX)
136135
if(CMAKE_CXX_COMPILER)
137136
enable_language(CXX)
@@ -348,7 +347,8 @@ if(NOT DEFINED MDBX_CXX_STANDARD)
348347
elseif(CXX_FALLBACK_GNU11 OR CXX_FALLBACK_11)
349348
set(MDBX_CXX_STANDARD 11)
350349
else()
351-
message(NOTICE "The C++ example will be skipped, since C++20 standard is unavailable or C++ API of libmdbx was disabled.")
350+
message(NOTICE
351+
"The C++ example will be skipped, since C++20 standard is unavailable or C++ API of libmdbx was disabled.")
352352
set(MDBX_CXX_STANDARD 0)
353353
endif()
354354
endif()
@@ -381,10 +381,6 @@ if(NOT DEFINED MDBX_C_STANDARD)
381381
endif()
382382
endif()
383383

384-
if((MINGW OR MINGW64) AND MDBX_BUILD_SHARED_LIBRARY)
385-
message(WARNING "Most MinGW versions have various problems with exporting and/or importing C++ template symbols instantiated in a DLL.")
386-
endif()
387-
388384
if(WIN32 AND EXISTS "${MDBX_SOURCE_DIR}/ntdll.def")
389385
if(MSVC)
390386
if(NOT MSVC_LIB_EXE)
@@ -524,8 +520,7 @@ else()
524520
endif()
525521

526522
set(MDBX_CXX_AVAILABLE FALSE)
527-
if(CMAKE_CXX_COMPILER_LOADED
528-
AND NOT MDBX_CXX_STANDARD LESS 11)
523+
if(CMAKE_CXX_COMPILER_LOADED AND NOT MDBX_CXX_STANDARD LESS 11)
529524
if(NOT MDBX_WITHOUT_MSVC_CRT
530525
AND NOT (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
531526
AND NOT (CMAKE_COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.9)
@@ -577,7 +572,10 @@ else()
577572
if(NOT CMAKE_CURRENT_LIST_FILE)
578573
set(CMAKE_CURRENT_LIST_FILE "CMakeLists.txt")
579574
endif()
580-
message(FATAL_ERROR "This \"${CMAKE_CURRENT_LIST_FILE}\" has been trimmed and is therefore intended only for build from an amalgamated form of the source code.")
575+
message(
576+
FATAL_ERROR
577+
"This \"${CMAKE_CURRENT_LIST_FILE}\" has been trimmed and is therefore intended only for build from an amalgamated form of the source code."
578+
)
581579
endif(MDBX_AMALGAMATED_SOURCE)
582580

583581
if(MDBX_BUILD_CXX)
@@ -674,6 +672,12 @@ target_include_directories(mdbx-static INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
674672

675673
# build shared library
676674
if(MDBX_BUILD_SHARED_LIBRARY)
675+
if((MINGW OR MINGW64) AND MDBX_BUILD_CXX)
676+
message(
677+
WARNING
678+
"Most MinGW versions have various problems with exporting and/or importing C++ template symbols instantiated in a DLL."
679+
)
680+
endif()
677681
add_library(mdbx SHARED ${LIBMDBX_SOURCES})
678682
set_target_properties(mdbx PROPERTIES PUBLIC_HEADER "${LIBMDBX_PUBLIC_HEADERS}")
679683
target_compile_definitions(

VERSION.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "git_describe": "v0.14.1-266-gf35f84b1", "git_timestamp": "2026-01-09T23:36:32+03:00", "git_tree": "6d82bea2526587e0f5c3aecc9bd17518c7a12051", "git_commit": "f35f84b1be442110f452739fe6666f7d92e6c00e", "semver": "0.14.1.266" }
1+
{ "git_describe": "v0.14.1-268-g6777dc84", "git_timestamp": "2026-01-10T00:18:28+03:00", "git_tree": "fef008f1cd79f69dd958b518d4e5b965a2f48378", "git_commit": "6777dc841a6c68ad11a2503492b673ffdcfccf0b", "semver": "0.14.1.268" }

mdbx.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#define xMDBX_ALLOY 1 /* alloyed build */
66

7-
#define MDBX_BUILD_SOURCERY 1a56b80922809a00bc640830dcac48665a1e14c1c62fd43f31673186d0d61aa5_v0_14_1_266_gf35f84b1
7+
#define MDBX_BUILD_SOURCERY 6781536f213351f8f9a83664e01c568238f4a4fa14529eba25a59dcfaafbf05d_v0_14_1_268_g6777dc84
88

99
#define LIBMDBX_INTERNALS
1010
#define MDBX_DEPRECATED
@@ -40428,10 +40428,10 @@ __dll_export
4042840428
0,
4042940429
14,
4043040430
1,
40431-
266,
40431+
268,
4043240432
"", /* pre-release suffix of SemVer
40433-
0.14.1.266 */
40434-
{"2026-01-09T23:36:32+03:00", "6d82bea2526587e0f5c3aecc9bd17518c7a12051", "f35f84b1be442110f452739fe6666f7d92e6c00e", "v0.14.1-266-gf35f84b1"},
40433+
0.14.1.268 */
40434+
{"2026-01-10T00:18:28+03:00", "fef008f1cd79f69dd958b518d4e5b965a2f48378", "6777dc841a6c68ad11a2503492b673ffdcfccf0b", "v0.14.1-268-g6777dc84"},
4043540435
sourcery};
4043640436

4043740437
__dll_export

mdbx.c++

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
33
/* clang-format off */
44

5-
#define MDBX_BUILD_SOURCERY 1a56b80922809a00bc640830dcac48665a1e14c1c62fd43f31673186d0d61aa5_v0_14_1_266_gf35f84b1
5+
#define MDBX_BUILD_SOURCERY 6781536f213351f8f9a83664e01c568238f4a4fa14529eba25a59dcfaafbf05d_v0_14_1_268_g6777dc84
66

77
#define LIBMDBX_INTERNALS
88
#define MDBX_DEPRECATED

mdbx_chk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 1a56b80922809a00bc640830dcac48665a1e14c1c62fd43f31673186d0d61aa5_v0_14_1_266_gf35f84b1
21+
#define MDBX_BUILD_SOURCERY 6781536f213351f8f9a83664e01c568238f4a4fa14529eba25a59dcfaafbf05d_v0_14_1_268_g6777dc84
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

mdbx_copy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 1a56b80922809a00bc640830dcac48665a1e14c1c62fd43f31673186d0d61aa5_v0_14_1_266_gf35f84b1
21+
#define MDBX_BUILD_SOURCERY 6781536f213351f8f9a83664e01c568238f4a4fa14529eba25a59dcfaafbf05d_v0_14_1_268_g6777dc84
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

mdbx_drop.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 1a56b80922809a00bc640830dcac48665a1e14c1c62fd43f31673186d0d61aa5_v0_14_1_266_gf35f84b1
21+
#define MDBX_BUILD_SOURCERY 6781536f213351f8f9a83664e01c568238f4a4fa14529eba25a59dcfaafbf05d_v0_14_1_268_g6777dc84
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

mdbx_dump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 1a56b80922809a00bc640830dcac48665a1e14c1c62fd43f31673186d0d61aa5_v0_14_1_266_gf35f84b1
21+
#define MDBX_BUILD_SOURCERY 6781536f213351f8f9a83664e01c568238f4a4fa14529eba25a59dcfaafbf05d_v0_14_1_268_g6777dc84
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

mdbx_load.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 1a56b80922809a00bc640830dcac48665a1e14c1c62fd43f31673186d0d61aa5_v0_14_1_266_gf35f84b1
21+
#define MDBX_BUILD_SOURCERY 6781536f213351f8f9a83664e01c568238f4a4fa14529eba25a59dcfaafbf05d_v0_14_1_268_g6777dc84
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

mdbx_stat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/// \copyright SPDX-License-Identifier: Apache-2.0
1919
/// \author Леонид Юрьев aka Leonid Yuriev <leo@yuriev.ru> \date 2015-2026
2020

21-
#define MDBX_BUILD_SOURCERY 1a56b80922809a00bc640830dcac48665a1e14c1c62fd43f31673186d0d61aa5_v0_14_1_266_gf35f84b1
21+
#define MDBX_BUILD_SOURCERY 6781536f213351f8f9a83664e01c568238f4a4fa14529eba25a59dcfaafbf05d_v0_14_1_268_g6777dc84
2222

2323
#define LIBMDBX_INTERNALS
2424
#define MDBX_DEPRECATED

0 commit comments

Comments
 (0)