From 592f31f0592cf7d9fe6bd9a9d61dc25dab857fb4 Mon Sep 17 00:00:00 2001 From: WarmUpTill Date: Sun, 2 Jul 2023 03:29:35 +0200 Subject: [PATCH] Use the correct build type for dependencies (Windows) Always building with the Release configuration caused issues (e.g. linking) when attempting to build non-release configurations when using the CI build scripts. This is not done for OpenCV as it does not support all build types. --- .github/scripts/Build-Windows.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/Build-Windows.ps1 b/.github/scripts/Build-Windows.ps1 index 1ff6afed..9cd2413f 100644 --- a/.github/scripts/Build-Windows.ps1 +++ b/.github/scripts/Build-Windows.ps1 @@ -104,7 +104,7 @@ function Build { '-G', $CmakeGenerator "-DCMAKE_SYSTEM_VERSION=${script:PlatformSDK}" "-DCMAKE_GENERATOR_PLATFORM=$(if (${script:Target} -eq "x86") { "Win32" } else { "x64" })" - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=${Configuration}" "-DCMAKE_PREFIX_PATH:PATH=${DepInstallPath}" "-DCMAKE_INSTALL_PREFIX:PATH=${DepInstallPath}" "-DSW_BUILD=OFF" @@ -115,7 +115,7 @@ function Build { Invoke-External cmake -S ${LeptonicaPath} -B ${LeptonicaBuildPath} @LeptonicaCmakeArgs $LeptonicaCmakeArgs = @( - '--config', "Release" + '--config', "${Configuration}" ) if ( $VerbosePreference -eq 'Continue' ) { @@ -140,7 +140,7 @@ function Build { '-G', $CmakeGenerator "-DCMAKE_SYSTEM_VERSION=${script:PlatformSDK}" "-DCMAKE_GENERATOR_PLATFORM=$(if (${script:Target} -eq "x86") { "Win32" } else { "x64" })" - "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_BUILD_TYPE=${Configuration}" "-DCMAKE_PREFIX_PATH:PATH=${DepInstallPath}" "-DCMAKE_INSTALL_PREFIX:PATH=${DepInstallPath}" "-DSW_BUILD=OFF" @@ -154,7 +154,7 @@ function Build { Invoke-External cmake -S ${TesseractPath} -B ${TesseractBuildPath} @TesseractCmakeArgs $TesseractCmakeArgs = @( - '--config', "Release" + '--config', "${Configuration}" ) if ( $VerbosePreference -eq 'Continue' ) {