From 3f395d703b66dbc66478d493b36311f71dd78c59 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 3 Jul 2023 17:41:45 +0200 Subject: [PATCH] Doc: dev: Windows: move "-DICINGA2_UNITY_BUILD=OFF" to avoid merge conflicts due to Boost updates in the long run. --- doc/21-development.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/21-development.md b/doc/21-development.md index 56720c589..adcba4f50 100644 --- a/doc/21-development.md +++ b/doc/21-development.md @@ -1763,10 +1763,10 @@ mkdir build cd .\build\ & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" ` - -DBoost_INCLUDE_DIR=C:\local\boost_1_81_0-Win64 ` + -DICINGA2_UNITY_BUILD=OFF -DBoost_INCLUDE_DIR=C:\local\boost_1_81_0-Win64 ` -DBISON_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_bison.exe ` -DFLEX_EXECUTABLE=C:\ProgramData\chocolatey\lib\winflexbison3\tools\win_flex.exe ` - -DICINGA2_WITH_MYSQL=OFF -DICINGA2_WITH_PGSQL=OFF -DICINGA2_UNITY_BUILD=OFF .. + -DICINGA2_WITH_MYSQL=OFF -DICINGA2_WITH_PGSQL=OFF .. & "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe" .\icinga2.sln ```