CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(cmakepreset): remove ccache

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers 2023-07-31 19:03:25 -07:00
parent 8c0a19d0c5
commit ced5b3dede
No known key found for this signature in database
GPG Key ID: E10E321EB160949B
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakePresets.json
View File

@ -20,9 +20,7 @@
"CMAKE_PREFIX_PATH": "${sourceDir}/libraries/Qt/6.5.1/msvc2019_64/lib/cmake", "CMAKE_PREFIX_PATH": "${sourceDir}/libraries/Qt/6.5.1/msvc2019_64/lib/cmake",
"Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6", "Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6",
"Launcher_BUILD_PLATFORM": "custom", "Launcher_BUILD_PLATFORM": "custom",
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL", "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL"
"CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
"CMAKE_EXPORT_COMPILE_COMMANDS": "yes"
}, },
"environment": { "environment": {
"CXX_FLAGS": "" "CXX_FLAGS": ""
@ -43,7 +41,6 @@
"Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6", "Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6",
"Launcher_BUILD_PLATFORM": "custom", "Launcher_BUILD_PLATFORM": "custom",
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL", "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL",
"CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
"CMAKE_EXPORT_COMPILE_COMMANDS": "yes" "CMAKE_EXPORT_COMPILE_COMMANDS": "yes"
}, },
"environment": { "environment": {
@ -54,7 +51,7 @@
{ {
"name": "windows_release", "name": "windows_release",
"displayName": "MSVC Release", "displayName": "MSVC Release",
"description": "MSVC build using Ninja generator", "description": "MSVC release build Visual Studio generator",
"generator": "Visual Studio 17 2022", "generator": "Visual Studio 17 2022",
"binaryDir": "${sourceDir}/build/", "binaryDir": "${sourceDir}/build/",
"cacheVariables": { "cacheVariables": {
@ -64,8 +61,7 @@
"CMAKE_PREFIX_PATH": "${sourceDir}/libraries/Qt/6.5.1/msvc2019_64/lib/cmake", "CMAKE_PREFIX_PATH": "${sourceDir}/libraries/Qt/6.5.1/msvc2019_64/lib/cmake",
"Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6", "Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6",
"Launcher_BUILD_PLATFORM": "custom", "Launcher_BUILD_PLATFORM": "custom",
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL", "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL"
"CMAKE_CXX_COMPILER_LAUNCHER": "ccache"
}, },
"environment": { "environment": {
"CXX_FLAGS": "" "CXX_FLAGS": ""
@ -78,6 +74,10 @@
"name": "windows_default", "name": "windows_default",
"configurePreset": "windows_default" "configurePreset": "windows_default"
}, },
{
"name": "windows_debug_ninja",
"configurePreset": "windows_debug_ninja"
},
{ {
"name": "windows_release", "name": "windows_release",
"configurePreset": "windows_release" "configurePreset": "windows_release"

8
installQT.ps1
View File

@ -3,11 +3,10 @@ $qt_path = ( Join-Path -Path "$PSScriptRoot/libraries" -ChildPath "Qt" )
New-Item -ItemType Directory -Path $qt_path -ErrorAction SilentlyContinue New-Item -ItemType Directory -Path $qt_path -ErrorAction SilentlyContinue
$aqt_path = ( Join-Path -Path $qt_path -ChildPath "aqt.exe" ) $aqt_path = ( Join-Path -Path $qt_path -ChildPath "aqt.exe" )
if (!([System.IO.File]::Exists($aqt_path))) { if (!(Test-Path -Path $aqt_path)) {
Start-BitsTransfer -Source $aqt_url -Destination $aqt_path Invoke-WebRequest -Uri $aqt_url -OutFile $aqt_path
} }
# Invoke-WebRequest -Uri $aqt_url -OutFile $aqt_path
#
$qt_ver = "6.5.1" $qt_ver = "6.5.1"
$system_arch = (Get-CimInstance -Class Win32_ComputerSystem).SystemType $system_arch = (Get-CimInstance -Class Win32_ComputerSystem).SystemType
$qt_arch = Switch ($system_arch) { $qt_arch = Switch ($system_arch) {
@ -17,7 +16,6 @@ $qt_arch = Switch ($system_arch) {
$aqt_install_args = @("install-qt", "windows", "desktop", $qt_ver, $qt_arch, "-m", "all", "--outputdir", $qt_path ) $aqt_install_args = @("install-qt", "windows", "desktop", $qt_ver, $qt_arch, "-m", "all", "--outputdir", $qt_path )
# call_aqt $aqt_install_args
$p = Start-Process -FilePath $aqt_path -ArgumentList $aqt_install_args -Wait $p = Start-Process -FilePath $aqt_path -ArgumentList $aqt_install_args -Wait