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

build: rm GUI_BINARY_NAME define

Browse source
This commit is contained in:
sithlord48 2024-10-28 21:06:08 -04:00 committed by Nick Bolton
parent e446397740
commit 078ec61e9a
4 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/Build.cmake
View file

@ -95,7 +95,7 @@ macro(post_config_all)
add_dependencies( add_dependencies(
run_post_build run_post_build
${GUI_BINARY_NAME} deskflow
${CLIENT_BINARY_NAME} ${CLIENT_BINARY_NAME}
${SERVER_BINARY_NAME} ${SERVER_BINARY_NAME}
${DAEMON_BINARY_NAME}) ${DAEMON_BINARY_NAME})

6
cmake/Definitions.cmake
View file

@ -73,10 +73,6 @@ endmacro()
macro(configure_bin_names) macro(configure_bin_names)
set(GUI_BINARY_NAME
"deskflow"
CACHE STRING "Filename of the GUI binary")
set(SERVER_BINARY_NAME set(SERVER_BINARY_NAME
"deskflow-server" "deskflow-server"
CACHE STRING "Filename of the server binary") CACHE STRING "Filename of the server binary")
@ -94,14 +90,12 @@ macro(configure_bin_names)
CACHE STRING "Filename of the daemon binary") CACHE STRING "Filename of the daemon binary")
message(VERBOSE "GUI binary: ${GUI_BINARY_NAME}")
message(VERBOSE "Server binary: ${SERVER_BINARY_NAME}") message(VERBOSE "Server binary: ${SERVER_BINARY_NAME}")
message(VERBOSE "Client binary: ${CLIENT_BINARY_NAME}") message(VERBOSE "Client binary: ${CLIENT_BINARY_NAME}")
message(VERBOSE "Core binary: ${CORE_BINARY_NAME}") message(VERBOSE "Core binary: ${CORE_BINARY_NAME}")
message(VERBOSE "Daemon binary: ${DAEMON_BINARY_NAME}") message(VERBOSE "Daemon binary: ${DAEMON_BINARY_NAME}")
add_definitions(-DGUI_BINARY_NAME="${GUI_BINARY_NAME}")
add_definitions(-DSERVER_BINARY_NAME="${SERVER_BINARY_NAME}") add_definitions(-DSERVER_BINARY_NAME="${SERVER_BINARY_NAME}")
add_definitions(-DCLIENT_BINARY_NAME="${CLIENT_BINARY_NAME}") add_definitions(-DCLIENT_BINARY_NAME="${CLIENT_BINARY_NAME}")
add_definitions(-DCORE_BINARY_NAME="${CORE_BINARY_NAME}") add_definitions(-DCORE_BINARY_NAME="${CORE_BINARY_NAME}")

2
deploy/dist/wix/Include.wxi.in vendored
View file

@ -21,7 +21,7 @@
<?define QtPluginsPath="$(var.QtDir)\plugins"?> <?define QtPluginsPath="$(var.QtDir)\plugins"?>
<?define OpenSslExeDir="@OPENSSL_EXE_DIR@"?> <?define OpenSslExeDir="@OPENSSL_EXE_DIR@"?>
<?define OpenSslDllDir="@OPENSSL_ROOT_DIR@/bin"?> <?define OpenSslDllDir="@OPENSSL_ROOT_DIR@/bin"?>
<?define GuiBin="@GUI_BINARY_NAME@.exe"?> <?define GuiBin="deskflow.exe"?>
<?define ServerBin="@SERVER_BINARY_NAME@.exe"?> <?define ServerBin="@SERVER_BINARY_NAME@.exe"?>
<?define ClientBin="@CLIENT_BINARY_NAME@.exe"?> <?define ClientBin="@CLIENT_BINARY_NAME@.exe"?>
<?define CoreBin="@CORE_BINARY_NAME@.exe"?> <?define CoreBin="@CORE_BINARY_NAME@.exe"?>

2
src/gui/CMakeLists.txt
View file

@ -13,7 +13,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
set(target ${GUI_BINARY_NAME}) set(target deskflow)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)