diff --git a/CMakePresets.json b/CMakePresets.json index 5fcac805d..8413c758f 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -20,9 +20,7 @@ "CMAKE_PREFIX_PATH": "${sourceDir}/libraries/Qt/6.5.1/msvc2019_64/lib/cmake", "Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6", "Launcher_BUILD_PLATFORM": "custom", - "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL", - "CMAKE_CXX_COMPILER_LAUNCHER": "ccache", - "CMAKE_EXPORT_COMPILE_COMMANDS": "yes" + "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL" }, "environment": { "CXX_FLAGS": "" @@ -43,7 +41,6 @@ "Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6", "Launcher_BUILD_PLATFORM": "custom", "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL", - "CMAKE_CXX_COMPILER_LAUNCHER": "ccache", "CMAKE_EXPORT_COMPILE_COMMANDS": "yes" }, "environment": { @@ -54,7 +51,7 @@ { "name": "windows_release", "displayName": "MSVC Release", - "description": "MSVC build using Ninja generator", + "description": "MSVC release build Visual Studio generator", "generator": "Visual Studio 17 2022", "binaryDir": "${sourceDir}/build/", "cacheVariables": { @@ -64,8 +61,7 @@ "CMAKE_PREFIX_PATH": "${sourceDir}/libraries/Qt/6.5.1/msvc2019_64/lib/cmake", "Launcher_BUILD_ARTIFACT": "Windows-MSVC-Qt6", "Launcher_BUILD_PLATFORM": "custom", - "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL", - "CMAKE_CXX_COMPILER_LAUNCHER": "ccache" + "CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreadedDLL" }, "environment": { "CXX_FLAGS": "" @@ -78,6 +74,10 @@ "name": "windows_default", "configurePreset": "windows_default" }, + { + "name": "windows_debug_ninja", + "configurePreset": "windows_debug_ninja" + }, { "name": "windows_release", "configurePreset": "windows_release" diff --git a/installQT.ps1 b/installQT.ps1 index f5c1650d9..0792e3866 100644 --- a/installQT.ps1 +++ b/installQT.ps1 @@ -3,11 +3,10 @@ $qt_path = ( Join-Path -Path "$PSScriptRoot/libraries" -ChildPath "Qt" ) New-Item -ItemType Directory -Path $qt_path -ErrorAction SilentlyContinue $aqt_path = ( Join-Path -Path $qt_path -ChildPath "aqt.exe" ) -if (!([System.IO.File]::Exists($aqt_path))) { - Start-BitsTransfer -Source $aqt_url -Destination $aqt_path +if (!(Test-Path -Path $aqt_path)) { + Invoke-WebRequest -Uri $aqt_url -OutFile $aqt_path } -# Invoke-WebRequest -Uri $aqt_url -OutFile $aqt_path -# + $qt_ver = "6.5.1" $system_arch = (Get-CimInstance -Class Win32_ComputerSystem).SystemType $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 ) -# call_aqt $aqt_install_args $p = Start-Process -FilePath $aqt_path -ArgumentList $aqt_install_args -Wait