Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-10-06 09:17:07 +02:00
Code Issues Projects Releases Activity

Change aqt download dir to be the same as vcpkg

Browse Source 
This removes the inconsistency and bundles all dependencies
in one folder.
This commit is contained in:
Elias Steurer 2022-12-17 12:52:00 +01:00
parent 70b1bb1c70
commit 3042de6d3b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakePresets.json
View File

@ -18,7 +18,7 @@
"rhs": "Windows"
},
"environment" : {
"aqt_path": "C:/aqt",
"aqt_path": "${sourceDir}/../aqt",
"qt_version": "6.4.1",
"VCToolsVersion": "14.34.31933",
"WindowsSDKVersion" : "10.0.22621.0",
@ -58,6 +58,9 @@
"lhs": "${hostSystemName}",
"rhs": "Linux"
},
"environment" : {
"aqt_path": "${sourceDir}/../aqt"
},
"architecture": {
"value": "x64",
"strategy": "external"
@ -66,7 +69,7 @@
"CMAKE_CXX_COMPILER": "g++",
"CMAKE_C_COMPILER": "gcc",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_PREFIX_PATH": "$env{HOME}/aqt/6.4.1/gcc_64",
"CMAKE_PREFIX_PATH": "$env{aqt_path}/6.4.1/gcc_64",
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake",
"VCPKG_TARGET_TRIPLET": "x64-linux"
}
@ -82,6 +85,9 @@
"lhs": "${hostSystemName}",
"rhs": "Darwin"
},
"environment" : {
"aqt_path": "${sourceDir}/../aqt"
},
"architecture": {
"value": "x64",
"strategy": "external"
@ -90,7 +96,7 @@
"CMAKE_CXX_COMPILER": "clang++",
"CMAKE_C_COMPILER": "clang",
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_PREFIX_PATH": "$env{HOME}/aqt/6.4.1/macos",
"CMAKE_PREFIX_PATH": "$env{aqt_path}/6.4.1/macos",
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake"
}
}

2
Tools/defines.py
View File

@ -8,7 +8,7 @@ VCPKG_VERSION = "2871ddd" # Master 11.11.2022
QT_VERSION = "6.4.1"
QT_IFW_VERSION = "4.5"
SCREENPLAY_VERSION = "0.15.0-RC3"
AQT_PATH = Path("C:/aqt") if sys.platform == "win32" else Path().home().joinpath("aqt")
AQT_PATH = Path.cwd().parent.parent.joinpath("aqt")
MAINTENANCE_PATH = Path("C:/Qt") if sys.platform == "win32" else Path().home().joinpath("Qt")
# Defined by Qt
if sys.platform == "win32":