diff --git a/cmake/Build.cmake b/cmake/Build.cmake index 7e1c0bdb6..7592d92fe 100644 --- a/cmake/Build.cmake +++ b/cmake/Build.cmake @@ -95,7 +95,7 @@ macro(post_config_all) add_dependencies( run_post_build - ${GUI_BINARY_NAME} + deskflow ${CLIENT_BINARY_NAME} ${SERVER_BINARY_NAME} ${DAEMON_BINARY_NAME}) diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake index 79d37e701..54ffa30d1 100644 --- a/cmake/Definitions.cmake +++ b/cmake/Definitions.cmake @@ -73,10 +73,6 @@ endmacro() macro(configure_bin_names) - set(GUI_BINARY_NAME - "deskflow" - CACHE STRING "Filename of the GUI binary") - set(SERVER_BINARY_NAME "deskflow-server" CACHE STRING "Filename of the server binary") @@ -94,14 +90,12 @@ macro(configure_bin_names) CACHE STRING "Filename of the daemon binary") - message(VERBOSE "GUI binary: ${GUI_BINARY_NAME}") message(VERBOSE "Server binary: ${SERVER_BINARY_NAME}") message(VERBOSE "Client binary: ${CLIENT_BINARY_NAME}") message(VERBOSE "Core binary: ${CORE_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(-DCLIENT_BINARY_NAME="${CLIENT_BINARY_NAME}") add_definitions(-DCORE_BINARY_NAME="${CORE_BINARY_NAME}") diff --git a/deploy/dist/wix/Include.wxi.in b/deploy/dist/wix/Include.wxi.in index 4fceaed3c..526775780 100644 --- a/deploy/dist/wix/Include.wxi.in +++ b/deploy/dist/wix/Include.wxi.in @@ -21,7 +21,7 @@ - + diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index d94a197bd..3c9009066 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -set(target ${GUI_BINARY_NAME}) +set(target deskflow) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON)