Skip to content

Commit 461a999

Browse files
committed
Turn off LMDB by default in Windows build to align with defaults for other platforms
- Replaced WITHOUT_XXX build options with WITH_XXX to make it easier to understand and configure. - Updated GitHub workflow to align with these changes and include a build 'with lmdb' (again, analogous to non-Windows configurations)
1 parent f73fb0e commit 461a999

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ jobs:
132132
configuration: [Release]
133133
configure:
134134
- {label: "full", opt: "" }
135-
- {label: "wo curl", opt: "-DWITHOUT_CURL=ON" }
136-
- {label: "wo lmdb", opt: "-DWITHOUT_LMDB=ON" }
137-
- {label: "wo lua", opt: "-DWITHOUT_LUA=ON" }
138-
- {label: "wo maxmind", opt: "-DWITHOUT_MAXMIND=ON" }
139-
- {label: "wo libxml", opt: "-WITHOUT_LIBXML2=ON" }
135+
- {label: "wo curl", opt: "-DWITH_CURL=OFF" }
136+
- {label: "wo lua", opt: "-DWITH_LUA=OFF" }
137+
- {label: "wo maxmind", opt: "-DWITH_MAXMIND=OFF" }
138+
- {label: "wo libxml", opt: "-DWITH_LIBXML2=OFF" }
139+
- {label: "with lmdb", opt: "-DWITH_LMDB=ON" }
140140
steps:
141141
- uses: actions/checkout@v4
142142
with:

build/win32/CMakeLists.txt

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.24)
22

33
set(BASE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
44

5-
option(WITHOUT_LMDB "Include LMDB support" OFF)
6-
option(WITHOUT_LUA "Include LUA support" OFF)
7-
option(WITHOUT_LIBXML2 "Include LibXML2 support" OFF)
8-
option(WITHOUT_MAXMIND "Include MaxMind support" OFF)
9-
option(WITHOUT_CURL "Include CURL support" OFF)
5+
option(WITH_LMDB "Include LMDB support" OFF)
6+
option(WITH_LUA "Include LUA support" ON)
7+
option(WITH_LIBXML2 "Include LibXML2 support" ON)
8+
option(WITH_MAXMIND "Include MaxMind support" ON)
9+
option(WITH_CURL "Include CURL support" ON)
1010

11-
option(USE_ASAN "Build with Address Sanitizer" OFF)
11+
option(USE_ASAN "Build with Address Sanitizer" OFF)
1212

1313
# common compiler settings
1414

@@ -93,17 +93,17 @@ set(HAVE_SSDEEP 0) # should always be zero, no conan package available
9393

9494
macro(enable_feature flag option)
9595
if(${option})
96-
set(${flag} 0)
96+
set(${flag} 1) # ON
9797
else()
98-
set(${flag} 1)
98+
set(${flag} 0) # OFF
9999
endif()
100100
endmacro()
101101

102-
enable_feature(HAVE_LMDB ${WITHOUT_LMDB})
103-
enable_feature(HAVE_LUA ${WITHOUT_LUA})
104-
enable_feature(HAVE_LIBXML2 ${WITHOUT_LIBXML2})
105-
enable_feature(HAVE_MAXMIND ${WITHOUT_MAXMIND})
106-
enable_feature(HAVE_CURL ${WITHOUT_CURL})
102+
enable_feature(HAVE_LMDB ${WITH_LMDB})
103+
enable_feature(HAVE_LUA ${WITH_LUA})
104+
enable_feature(HAVE_LIBXML2 ${WITH_LIBXML2})
105+
enable_feature(HAVE_MAXMIND ${WITH_MAXMIND})
106+
enable_feature(HAVE_CURL ${WITH_CURL})
107107

108108
include(${CMAKE_CURRENT_LIST_DIR}/ConfigureChecks.cmake)
109109

0 commit comments

Comments
 (0)