From 5b00e895577db64f35c7bf71b83b88f5ed4203b1 Mon Sep 17 00:00:00 2001 From: Rurigk Date: Fri, 8 Sep 2023 01:26:21 -0600 Subject: [PATCH] Add a linux generic target that uses system QT Keep the aqt target with a different name --- CMakePresets.json | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 31230776..9c69b60e 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -74,7 +74,7 @@ } }, { - "name": "linux-debug", + "name": "linux-generic-debug", "displayName": "ScreenPlay 64bit Debug Linux", "description": "Linux only!", "generator": "Ninja", @@ -84,6 +84,40 @@ "lhs": "${hostSystemName}", "rhs": "Linux" }, + "architecture": { + "value": "x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_CXX_COMPILER": "g++", + "CMAKE_C_COMPILER": "gcc", + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/../vcpkg/scripts/buildsystems/vcpkg.cmake", + "VCPKG_TARGET_TRIPLET": "x64-linux", + "SCREENPLAY_STEAM": "OFF", + "SCREENPLAY_TESTS": "OFF" + } + }, + { + "name": "linux-relwithdebinfo", + "displayName": "ScreenPlay 64bit RelWithDebInfo Linux", + "inherits": "linux-generic-debug", + "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_RelWithDebInfo", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo" + } + }, + { + "name": "linux-aqt-debug", + "displayName": "ScreenPlay 64bit Debug Linux using aqt", + "description": "Linux only!", + "generator": "Ninja", + "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_Debug", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + }, "environment": { "qt_path": "${sourceDir}/../aqt" }, @@ -101,9 +135,9 @@ } }, { - "name": "linux-relwithdebinfo", - "displayName": "ScreenPlay 64bit RelWithDebInfo Linux", - "inherits": "linux-debug", + "name": "linux-aqt-relwithdebinfo", + "displayName": "ScreenPlay 64bit RelWithDebInfo Linux using aqt", + "inherits": "linux-ubuntu-debug", "binaryDir": "${sourceDir}/../build_ScreenPlay_Qt_6.5.2_GCC_RelWithDebInfo", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo"