smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: rm DESKFLOW_VERSION_URL define

Browse source
This commit is contained in:
sithlord48 2024-10-28 17:49:24 -04:00 committed by Nick Bolton
parent e865397f12
commit bdcf770de6
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/Definitions.cmake
View file

@ -54,10 +54,6 @@ endmacro()
macro(configure_meta) macro(configure_meta)
set(DESKFLOW_VERSION_URL
"https://api.deskflow.org/version"
CACHE STRING "URL to get the latest version")
set(DESKFLOW_HELP_TEXT set(DESKFLOW_HELP_TEXT
"Report a bug" "Report a bug"
CACHE STRING "Text label for the help menu item") CACHE STRING "Text label for the help menu item")
@ -74,14 +70,12 @@ macro(configure_meta)
true true
CACHE BOOL "Show developer thanks message") CACHE BOOL "Show developer thanks message")
message(VERBOSE "Version URL: ${DESKFLOW_VERSION_URL}")
message(VERBOSE "Help text: ${DESKFLOW_HELP_TEXT}") message(VERBOSE "Help text: ${DESKFLOW_HELP_TEXT}")
message(VERBOSE "Res dir: ${DESKFLOW_DEPLOY_RES_DIR}") message(VERBOSE "Res dir: ${DESKFLOW_DEPLOY_RES_DIR}")
message(VERBOSE "Mac bundle code: ${DESKFLOW_MAC_BUNDLE_CODE}") message(VERBOSE "Mac bundle code: ${DESKFLOW_MAC_BUNDLE_CODE}")
message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}") message(VERBOSE "Show dev thanks: ${DESKFLOW_SHOW_DEV_THANKS}")
# TODO: We need to move this to configure_file() in the future, which is much cleaner. # TODO: We need to move this to configure_file() in the future, which is much cleaner.
add_definitions(-DDESKFLOW_VERSION_URL="${DESKFLOW_VERSION_URL}")
add_definitions(-DDESKFLOW_HELP_TEXT="${DESKFLOW_HELP_TEXT}") add_definitions(-DDESKFLOW_HELP_TEXT="${DESKFLOW_HELP_TEXT}")
if(DESKFLOW_SHOW_DEV_THANKS) if(DESKFLOW_SHOW_DEV_THANKS)

5
src/lib/gui/env_vars.h
View file

@ -23,10 +23,7 @@ namespace deskflow::gui::env_vars {
inline QString versionUrl() inline QString versionUrl()
{ {
if (QString(DESKFLOW_VERSION_URL).isEmpty()) { return qEnvironmentVariable("DESKFLOW_VERSION_URL", QStringLiteral("https://api.deskflow.org/version"));
qFatal("version url is not set");
}
return qEnvironmentVariable("DESKFLOW_VERSION_URL", DESKFLOW_VERSION_URL);
} }
} // namespace deskflow::gui::env_vars } // namespace deskflow::gui::env_vars