Commit 266e68c

committed

Update to build libModSecurity with std C++20

1 parent 7bdc3c8 commit 266e68cCopy full SHA for 266e68c

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ Windows build information can be found [here](build/win32/README.md).`
`81`	`81`
`82`	`82`	`## Dependencies`
`83`	`83`
`84`		`-This library is written in C++ using the C++17 standards. It also uses Flex`
	`84`	`+This library is written in C++ using the C++20 standards. It also uses Flex`
`85`	`85`	`and Yacc to produce the "Sec Rules Language" parser. Other, mandatory dependencies include YAJL, as ModSecurity uses JSON for producing logs and its testing framework, libpcre (not yet mandatory) for processing regular expressions in SecRules, and libXML2 (not yet mandatory) which is used for parsing XML requests.`
`86`	`86`
`87`	`87`	`All others dependencies are related to operators specified within SecRules or configuration directives and may not be required for compilation. A short list of such dependencies is as follows:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ PKG_PROG_PKG_CONFIG`
`53`	`53`
`54`	`54`
`55`	`55`	`# Set C++ standard version and check if compiler supports it.`
`56`		`-AX_CXX_COMPILE_STDCXX(17, noext, mandatory)`
	`56`	`+AX_CXX_COMPILE_STDCXX(20, noext, mandatory)`
`57`	`57`
`58`	`58`	`# Check for libinjection`
`59`	`59`	`if ! test -f "${srcdir}/others/libinjection/src/libinjection_html5.c"; then`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ if "%3"=="USE_ASAN" (`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`cd build\win32`
`23`		`-conan install . -s compiler.cppstd=17 %CI_ASAN% --output-folder=build --build=missing --settings=build_type=%build_type% --settings=arch=%arch%`
	`23`	`+conan install . -s compiler.cppstd=20 %CI_ASAN% --output-folder=build --build=missing --settings=build_type=%build_type% --settings=arch=%arch%`
`24`	`24`	`cd build`
`25`	`25`	`cmake --fresh .. -G "Visual Studio 17 2022" -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DUSE_ASAN=%ASAN_FLAG% %4 %5 %6 %7 %8 %9`
`26`	`26`	`cmake --build . --config %build_type%`

Comments

(0)