From a3ff52f00a0faf2383909f58c61717708a920080 Mon Sep 17 00:00:00 2001 From: anonimal Date: Thu, 14 Mar 2019 23:26:50 +0000 Subject: [PATCH 1/2] Makefile: remove redundant GUI target I have no idea how that got in there. I must've pushed a non-fixup'd branch by accident. --- Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile index b6183bed..d0be5571 100644 --- a/Makefile +++ b/Makefile @@ -18,10 +18,6 @@ cmake_gui = -D BUILD_GUI=ON cmake_static = -D STATIC=ON cmake_tests = -D BUILD_TESTS=ON -gui: - $(eval command += $(cmake_release) $(cmake_gui)) - $(call CMAKE,$(dir_release),$(command)) && $(MAKE) - # Helper macro define CMAKE mkdir -p $1 && cd $1 && $2 ../../ From 4926d91190fa88cbb16514ac9ad44dfca9942680 Mon Sep 17 00:00:00 2001 From: anonimal Date: Thu, 14 Mar 2019 23:27:56 +0000 Subject: [PATCH 2/2] CMake: add GUI convenience "bundle" Sets GUI target output to a GUI directory, copies needed HTML files for runtime. Related refactoring. --- src/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac57925c..fcc094a3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -162,9 +162,15 @@ if(BUILD_GUI) set_property(TARGET Zano PROPERTY FOLDER "prog") set_target_properties(Zano PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/gui/qt-daemon/Info.plist.in) - set_target_properties(Zano PROPERTIES VS_DEBUGGER_COMMAND_ARGUMENTS "--html-path=${CMAKE_CURRENT_SOURCE_DIR}/gui/qt-daemon/html") + set(HTML_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gui/qt-daemon/html) + set_target_properties(Zano PROPERTIES VS_DEBUGGER_COMMAND_ARGUMENTS "--html-path=${HTML_DIR}") set(CMAKE_AUTOMOC OFF) + + # GUI convenience "bundle" + set(GUI_DIR ${CMAKE_CURRENT_BINARY_DIR}/gui) + set_target_properties(Zano PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${GUI_DIR}) + add_custom_command(TARGET Zano POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${HTML_DIR} ${GUI_DIR}/html) endif() if(APPLE)