From efb5cbe484eec88f7000a47704318688e616406a Mon Sep 17 00:00:00 2001
From: Ivan Pelipenko <peri4ko@yandex.ru>
Date: Sun, 16 Aug 2020 16:36:46 +0300
Subject: [PATCH] blockview migrate to "deploy*"

---
 qad/blockview/blockeditor/CMakeLists.txt      |  26 +++++++++--
 qad/blockview/blockeditor/icons/blockview.png | Bin 0 -> 4315 bytes
 .../blockeditor/resource_win_icon.rc          |  43 ------------------
 3 files changed, 23 insertions(+), 46 deletions(-)
 create mode 100644 qad/blockview/blockeditor/icons/blockview.png
 delete mode 100644 qad/blockview/blockeditor/resource_win_icon.rc

diff --git a/qad/blockview/blockeditor/CMakeLists.txt b/qad/blockview/blockeditor/CMakeLists.txt
index b003eff..d69d9d8 100644
--- a/qad/blockview/blockeditor/CMakeLists.txt
+++ b/qad/blockview/blockeditor/CMakeLists.txt
@@ -1,8 +1,26 @@
 project(blockeditor)
+import_version(${PROJECT_NAME} QAD)
 find_qt(${QtVersions} Core Gui Widgets)
+if (Qt5_FOUND)
+	import_version(${PROJECT_NAME}5 ${PROJECT_NAME})
+	import_deploy_properties(${PROJECT_NAME}5 ${PROJECT_NAME})
+endif()
+set_deploy_property(${PROJECT_NAME}
+		LABEL 		${PROJECT_NAME}
+		FULLNAME 	"${_QAD_DOMAIN}.${PROJECT_NAME}"
+		COMPANY 	${_QAD_COMPANY}
+		INFO 		"Editor for BlockView Blocks")
+if(APPLE)
+	#set_deploy_property(${PROJECT_NAME} ICON "icons/blockview.icns")
+elseif(WIN32)
+	set_deploy_property(${PROJECT_NAME} ICON "icons/blockview.ico")
+else()
+	set_deploy_property(${PROJECT_NAME} ICON "icons/blockview.png")
+endif()
+make_rc(${PROJECT_NAME} out_RC)
 qt_sources(SRC)
-qt_wrap(${SRC} CPPS out_CPP QMS out_QM)
-qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP ${out_RC})
 qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qad_blockview)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
@@ -18,5 +36,7 @@ if(LIB)
 	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 else()
 	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+endif()
+if (Qt5_FOUND)
+	deploy_target(${PROJECT_NAME}5 VERBOSE DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../release)
 endif()
diff --git a/qad/blockview/blockeditor/icons/blockview.png b/qad/blockview/blockeditor/icons/blockview.png
new file mode 100644
index 0000000000000000000000000000000000000000..44f65d736d20d5c17084e58066d502db6ccb0709
GIT binary patch
literal 4315
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
JPDHLkV1mY_2gd*a

literal 0
HcmV?d00001

diff --git a/qad/blockview/blockeditor/resource_win_icon.rc b/qad/blockview/blockeditor/resource_win_icon.rc
deleted file mode 100644
index 09b2a10..0000000
--- a/qad/blockview/blockeditor/resource_win_icon.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-# if defined(UNDER_CE)
-#  include <winbase.h>
-# else
-#  include <winver.h>
-# endif
-
-1 ICON icons/blockview.ico
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION 1,0,0,0
-PRODUCTVERSION 1,0,0,0
-FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
-FILEFLAGS 0x9L
-#else
-FILEFLAGS 0x8L
-#endif
-FILEOS 0x40004L
-FILETYPE 0x2L
-FILESUBTYPE 0x0L
-BEGIN
-BLOCK "StringFileInfo"
-BEGIN
-BLOCK "040904b0"
-BEGIN
-VALUE "Comments", "\0"
-VALUE "CompanyName", "BMSTU SM5\0"
-VALUE "FileDescription", "Block Editor\0"
-VALUE "FileVersion", "1,0,0,0\0"
-VALUE "InternalName", "Block Editor\0"
-VALUE "LegalTrademarks", "\0"
-VALUE "OriginalFilename", "blockeditor.exe\0"
-VALUE "PrivateBuild", "1\0"
-VALUE "ProductName", "Block Editor\0"
-VALUE "ProductVersion", "1, 0, 0, 0\0"
-VALUE "SpecialBuild", "\0"
-END
-END
-BLOCK "VarFileInfo"
-BEGIN
-VALUE "Translation", 0x409, 1200
-END
-END