added icon

GaitRehabilitation · Feb 19, 2019 · 68f946e · 68f946e
1 parent 6097104
commit 68f946e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,7 +31,6 @@ ui_*.h
 qrc_*.cpp
 Thumbs.db
 *.res
-*.rc
 /.qmake.cache
 /.qmake.stash
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -100,7 +100,7 @@ qt5_wrap_ui(UI_HEADERS ${UIS})
 qt5_add_resources(QRCS ${RESOURCES})
 
 # Tell CMake to create the helloworld executable
-add_executable(SMART ${UI_HEADERS} ${QRCS} ${SOURCES} ${HEADERS} ${PLATFORM_SOURCE} ${PLATFORM_HEADERS} )
+add_executable(SMART ${UI_HEADERS} ${QRCS} ${SOURCES} ${HEADERS} ${PLATFORM_SOURCE} ${PLATFORM_HEADERS} "app.rc")
 
 add_subdirectory(./3rdparty)
 # Add the Qt5 Widgets for linking
@@ -149,6 +149,11 @@ install(TARGETS SMART
 	DESTINATION "."
 )
 
+install(
+    DIRECTORY ${CMAKE_SOURCE_DIR}/icons/
+    DESTINATION icons
+)
+
 set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "SMART Application")
 
 if(NOT DEFINED ${CPACK_PACKAGE_VERSION_MAJOR})
@@ -180,4 +185,5 @@ set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/icons\\\\gait-icon.bmp")
 set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/icons/gait-icon.ico")
 set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/icons/gait-icon.ico")
 
+set (CPACK_NSIS_MODIFY_PATH "ON")
 INCLUDE(CPack)
diff --git a/app.rc b/app.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "icons/gait-icon.ico"
diff --git a/qml.qrc b/qml.qrc
@@ -3,5 +3,6 @@
         <file>icons/history-solid.svg</file>
         <file>icons/plus-solid.svg</file>
         <file>icons/download-solid.svg</file>
+        <file>icons/gait-icon.ico</file>
     </qresource>
 </RCC>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		IDI_ICON1 ICON DISCARDABLE "icons/gait-icon.ico"