Skip to content

Commit 3a088dd

Browse files
committed
Fix
1 parent 3fe9afd commit 3a088dd

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build.libgit2.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,16 @@ function Assert-Consistent-Naming($expected, $path) {
100100
try {
101101
Push-Location $libgit2Directory
102102

103+
# Patch CMakeLists.txt to fix LIBGIT2_FILENAME not being used when compiling the .rc file
104+
(Get-Content src\CMakeLists.txt) -replace 'target_compile_definitions(git2internal PRIVATE LIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\")', 'target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\")' | Set-Content src\CMakeLists.txt
105+
103106
$cmake = Find-CMake
104107
$ctest = Join-Path (Split-Path -Parent $cmake) "ctest.exe"
105108

106109
Run-Command -Quiet { & remove-item build -recurse -force -ErrorAction Ignore }
107110
Run-Command -Quiet { & mkdir build }
108111
cd build
109112

110-
# Patch CMakeLists.txt to fix versions
111-
(Get-Content src\CMakeLists.txt) -replace 'target_compile_definitions(git2internal PRIVATE LIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\")', 'target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\")' | Set-Content src\CMakeLists.txt
112-
113113
if ($x86.IsPresent) {
114114
Write-Output "Building 32-bit..."
115115
Run-Command -Fatal { & $cmake -G "Visual Studio 16 2019" -A Win32 -D ENABLE_TRACE=ON -D USE_SSH=OFF -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" .. }

0 commit comments

Comments
 (0)