From 1c5180cb87012bb069791931ac0861813b46970a Mon Sep 17 00:00:00 2001 From: Julien Richard Date: Mon, 10 May 2021 13:20:54 +0200 Subject: [PATCH 1/2] Allow compiling with Visual Studio 2019 --- build.libgit2.ps1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.libgit2.ps1 b/build.libgit2.ps1 index e55e283e..4a68c8b2 100644 --- a/build.libgit2.ps1 +++ b/build.libgit2.ps1 @@ -124,7 +124,12 @@ try { cd .. Run-Command -Quiet { & mkdir build64 } cd build64 - Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs Win64" -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } + if ($vs -eq "16") { + Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs" -A x64 -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } + } + else { + Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs Win64" -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } + } Run-Command -Quiet -Fatal { & $cmake --build . --config $configuration } if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } } cd $configuration From 31d7c954b8828d52133fc1e790084c604f7db842 Mon Sep 17 00:00:00 2001 From: Julien Richard Date: Tue, 25 May 2021 12:04:11 +0200 Subject: [PATCH 2/2] Update --- build.libgit2.ps1 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/build.libgit2.ps1 b/build.libgit2.ps1 index 4a68c8b2..1c476d61 100644 --- a/build.libgit2.ps1 +++ b/build.libgit2.ps1 @@ -124,12 +124,7 @@ try { cd .. Run-Command -Quiet { & mkdir build64 } cd build64 - if ($vs -eq "16") { - Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs" -A x64 -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } - } - else { - Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs Win64" -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } - } + Run-Command -Quiet -Fatal { & $cmake -G "Visual Studio $vs" -A x64 -D THREADSAFE=ON -D ENABLE_TRACE=ON -D "BUILD_CLAR=$build_clar" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } Run-Command -Quiet -Fatal { & $cmake --build . --config $configuration } if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } } cd $configuration