github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Turn off LMDB by default in Windows build to align with defaults for other platforms

Browse Source 
- 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)
This commit is contained in:
Eduardo Arias 2024-08-07 11:50:55 -07:00
parent e2b3c9594f
commit 4e15f9ef71
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View File

@ -132,11 +132,11 @@ jobs:
configuration: [Release] configuration: [Release]
configure: configure:
- {label: "full", opt: "" } - {label: "full", opt: "" }
- {label: "wo curl", opt: "-DWITHOUT_CURL=ON" } - {label: "wo curl", opt: "-DWITH_CURL=OFF" }
- {label: "wo lmdb", opt: "-DWITHOUT_LMDB=ON" } - {label: "wo lua", opt: "-DWITH_LUA=OFF" }
- {label: "wo lua", opt: "-DWITHOUT_LUA=ON" } - {label: "wo maxmind", opt: "-DWITH_MAXMIND=OFF" }
- {label: "wo maxmind", opt: "-DWITHOUT_MAXMIND=ON" } - {label: "wo libxml", opt: "-DWITH_LIBXML2=OFF" }
- {label: "wo libxml", opt: "-WITHOUT_LIBXML2=ON" } - {label: "with lmdb", opt: "-DWITH_LMDB=ON" }
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:

26
build/win32/CMakeLists.txt
View File

@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.24)
set(BASE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..) set(BASE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
option(WITHOUT_LMDB "Include LMDB support" OFF) option(WITH_LMDB "Include LMDB support" OFF)
option(WITHOUT_LUA "Include LUA support" OFF) option(WITH_LUA "Include LUA support" ON)
option(WITHOUT_LIBXML2 "Include LibXML2 support" OFF) option(WITH_LIBXML2 "Include LibXML2 support" ON)
option(WITHOUT_MAXMIND "Include MaxMind support" OFF) option(WITH_MAXMIND "Include MaxMind support" ON)
option(WITHOUT_CURL "Include CURL support" OFF) option(WITH_CURL "Include CURL support" ON)
option(USE_ASAN "Build with Address Sanitizer" OFF) option(USE_ASAN "Build with Address Sanitizer" OFF)
# common compiler settings # common compiler settings
@ -93,17 +93,17 @@ set(HAVE_SSDEEP 0) # should always be zero, no conan package available
macro(enable_feature flag option) macro(enable_feature flag option)
if(${option}) if(${option})
set(${flag} 0) set(${flag} 1) # ON
else() else()
set(${flag} 1) set(${flag} 0) # OFF
endif() endif()
endmacro() endmacro()
enable_feature(HAVE_LMDB ${WITHOUT_LMDB}) enable_feature(HAVE_LMDB ${WITH_LMDB})
enable_feature(HAVE_LUA ${WITHOUT_LUA}) enable_feature(HAVE_LUA ${WITH_LUA})
enable_feature(HAVE_LIBXML2 ${WITHOUT_LIBXML2}) enable_feature(HAVE_LIBXML2 ${WITH_LIBXML2})
enable_feature(HAVE_MAXMIND ${WITHOUT_MAXMIND}) enable_feature(HAVE_MAXMIND ${WITH_MAXMIND})
enable_feature(HAVE_CURL ${WITHOUT_CURL}) enable_feature(HAVE_CURL ${WITH_CURL})
include(${CMAKE_CURRENT_LIST_DIR}/ConfigureChecks.cmake) include(${CMAKE_CURRENT_LIST_DIR}/ConfigureChecks.cmake)