ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[CI] Use proper POWERSHELL variable casing 

The POWERSHELL cmake variable was sometimes used lowercase.
This commit is contained in:
Fabrice de Gans 2024-03-10 16:15:44 -07:00
parent e998a4016a
commit 69769c1bef
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -58,7 +58,7 @@ if(WIN32)
HINTS "/Windows/System32/WindowsPowerShell/v1.0" HINTS "/Windows/System32/WindowsPowerShell/v1.0"
REQUIRED) REQUIRED)
else() else()
find_program(powershell pwsh REQUIRED) find_program(POWERSHELL pwsh REQUIRED)
endif() endif()
include(Set-Toolchain-vcpkg) include(Set-Toolchain-vcpkg)

2
cmake/MakeReleaseCommitAndTag.cmake
View File

@ -189,7 +189,7 @@ Ignore the following cmake error.
if(CMAKE_HOST_SYSTEM MATCHES Windows OR ((NOT DEFINED CMAKE_HOST_SYSTEM) AND WIN32)) if(CMAKE_HOST_SYSTEM MATCHES Windows OR ((NOT DEFINED CMAKE_HOST_SYSTEM) AND WIN32))
execute_process( execute_process(
COMMAND powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command [=[ COMMAND ${POWERSHELL} -NoLogo -NoProfile -ExecutionPolicy Bypass -Command [=[
$text = [IO.File]::ReadAllText("CHANGELOG.md.work") -replace "`r`n", "`n" $text = [IO.File]::ReadAllText("CHANGELOG.md.work") -replace "`r`n", "`n"
[IO.File]::WriteAllText("CHANGELOG.md", $text) [IO.File]::WriteAllText("CHANGELOG.md", $text)
]=] ]=]

2
cmake/Set-Toolchain-vcpkg.cmake
View File

@ -319,7 +319,7 @@ function(get_binary_packages vcpkg_exe)
# -command "import-module ($env:USERPROFILE + '/source/repos/vcpkg-binpkg-prototype/vcpkg-binpkg.psm1'); vcpkg-instpkg ." # -command "import-module ($env:USERPROFILE + '/source/repos/vcpkg-binpkg-prototype/vcpkg-binpkg.psm1'); vcpkg-instpkg ."
execute_process( execute_process(
COMMAND ${powershell} COMMAND ${POWERSHELL}
-executionpolicy bypass -noprofile -executionpolicy bypass -noprofile
-command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-instpkg ." -command "import-module '${CMAKE_BINARY_DIR}/vcpkg-binpkg/vcpkg-binpkg.psm1'; vcpkg-instpkg ."
WORKING_DIRECTORY ${bin_pkgs_dir} WORKING_DIRECTORY ${bin_pkgs_dir}

2
cmake/UpdateAppcast.cmake
View File

@ -84,7 +84,7 @@ Ignore the following cmake error.
if(CMAKE_HOST_SYSTEM MATCHES Windows OR ((NOT DEFINED CMAKE_HOST_SYSTEM) AND WIN32)) if(CMAKE_HOST_SYSTEM MATCHES Windows OR ((NOT DEFINED CMAKE_HOST_SYSTEM) AND WIN32))
execute_process( execute_process(
COMMAND powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command [=[ COMMAND ${POWERSHELL} -NoLogo -NoProfile -ExecutionPolicy Bypass -Command [=[
$text = [IO.File]::ReadAllText("appcast.xml.work") -replace "`r`n", "`n" $text = [IO.File]::ReadAllText("appcast.xml.work") -replace "`r`n", "`n"
[IO.File]::WriteAllText("appcast.xml", $text) [IO.File]::WriteAllText("appcast.xml", $text)
]=] ]=]