From a9ec415c6447c99da0083b8ee091e1f4c4b3968f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 13 Jun 2023 16:50:34 +0200 Subject: [PATCH] Add Launcher_DEV_DATA to separate dev build data from prod data --- CMakeLists.txt | 3 +++ notsecrets/CMakeLists.txt | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fbcc98f..b50716f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,9 @@ set(Launcher_SUBREDDIT_URL "" CACHE STRING "URL for the subreddit.") # Use the secrets library or a public stub? option(Launcher_EMBED_SECRETS "Determines whether to embed secrets. Secrets are separate and non-public." OFF) +# Use development data folder(s) +option(Launcher_DEV_DATA "Use separate, development data folders." ON) + #### Custom target to feed the version to github actions. add_custom_target(ga_version echo ::set-output name=version::${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}) diff --git a/notsecrets/CMakeLists.txt b/notsecrets/CMakeLists.txt index 274da891..d0b29aa9 100644 --- a/notsecrets/CMakeLists.txt +++ b/notsecrets/CMakeLists.txt @@ -9,7 +9,11 @@ set(Launcher_Copyright "MultiMC Contributors" CACHE INTERNAL "") set(Launcher_Copyright_Full "Copyright 2015-2023 ${Launcher_Copyright}" CACHE INTERNAL "") set(Launcher_Domain "multimc.org" CACHE INTERNAL "") set(Launcher_Name "${Launcher_CommonName}" CACHE INTERNAL "") -set(Launcher_FSName "devlauncher" CACHE INTERNAL "") +if(Launcher_DEV_DATA) + set(Launcher_FSName "devlauncher-dev" CACHE INTERNAL "") +else() + set(Launcher_FSName "devlauncher" CACHE INTERNAL "") +endif() set(Launcher_DisplayName "${Launcher_CommonName} 6" CACHE INTERNAL "") set(Launcher_UserAgent "${Launcher_CommonName}/6.0" CACHE INTERNAL "") set(Launcher_ConfigFile "${Launcher_FSName}.cfg" CACHE INTERNAL "")