build: rm DAEMON_BINARY_NAME
This commit is contained in:
@ -98,7 +98,7 @@ macro(post_config_all)
|
|||||||
deskflow
|
deskflow
|
||||||
deskflow-client
|
deskflow-client
|
||||||
deskflow-server
|
deskflow-server
|
||||||
${DAEMON_BINARY_NAME})
|
deskflow-daemon)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|||||||
@ -67,22 +67,6 @@ macro(configure_meta)
|
|||||||
message(VERBOSE "Not showing developer thanks message")
|
message(VERBOSE "Not showing developer thanks message")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
configure_bin_names()
|
|
||||||
|
|
||||||
endmacro()
|
|
||||||
|
|
||||||
macro(configure_bin_names)
|
|
||||||
|
|
||||||
set(DAEMON_BINARY_NAME
|
|
||||||
"deskflow-daemon"
|
|
||||||
CACHE STRING "Filename of the daemon binary")
|
|
||||||
|
|
||||||
|
|
||||||
message(VERBOSE "Daemon binary: ${DAEMON_BINARY_NAME}")
|
|
||||||
|
|
||||||
|
|
||||||
add_definitions(-DDAEMON_BINARY_NAME="${DAEMON_BINARY_NAME}")
|
|
||||||
|
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(configure_ninja)
|
macro(configure_ninja)
|
||||||
|
|||||||
2
deploy/dist/wix/Include.wxi.in
vendored
2
deploy/dist/wix/Include.wxi.in
vendored
@ -25,5 +25,5 @@
|
|||||||
<?define ServerBin="deskflow-server.exe"?>
|
<?define ServerBin="deskflow-server.exe"?>
|
||||||
<?define ClientBin="deskflow-client.exe"?>
|
<?define ClientBin="deskflow-client.exe"?>
|
||||||
<?define CoreBin="deskflow-core.exe"?>
|
<?define CoreBin="deskflow-core.exe"?>
|
||||||
<?define DaemonBin="@DAEMON_BINARY_NAME@.exe"?>
|
<?define DaemonBin="deskflow-daemon.exe"?>
|
||||||
</Include>
|
</Include>
|
||||||
|
|||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
# Daemon is only needed on Windows for elevating processes to deal with UAC.
|
# Daemon is only needed on Windows for elevating processes to deal with UAC.
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(target ${DAEMON_BINARY_NAME})
|
set(target deskflow-daemon)
|
||||||
add_executable(${target} WIN32
|
add_executable(${target} WIN32
|
||||||
deskflowd.cpp
|
deskflowd.cpp
|
||||||
"${PROJECT_BINARY_DIR}/src/version.rc"
|
"${PROJECT_BINARY_DIR}/src/version.rc"
|
||||||
|
|||||||
@ -60,7 +60,7 @@
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
const char *const kLogFilename = DAEMON_BINARY_NAME ".log";
|
const char *const kLogFilename = "deskflow-daemon.log";
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
void updateSetting(const IpcMessage &message)
|
void updateSetting(const IpcMessage &message)
|
||||||
|
|||||||
Reference in New Issue
Block a user