Skip to content

Commit 028bf50

Browse files
ratijasWaqar144
authored andcommitted
CPack: Fix icon paths
Some of those resources have never existed in the repository. But I replaced them with TODO instead of removing entirely in a hope that maybe someday someone would implement/draw them. This patch fixes CPack enough to get it through the package and installation stages. However, Qt dynamic libs are still missing, so the installed exe can't launch as is. Needs windeployqt or something.
1 parent c66a6a0 commit 028bf50

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -975,16 +975,17 @@ set(CPACK_RPM_PACKAGE_GROUP "Development/Tools")
975975
set(CPACK_DEBIAN_PACKAGE_SECTION "Development")
976976

977977
set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/${README_FILE}")
978-
set(ICONS_DIR "${CMAKE_SOURCE_DIR}/resources")
978+
set(ICONS_DIR "${CMAKE_SOURCE_DIR}/ui/resources/gammaray")
979979
if(WIN32)
980980
set(CPACK_GENERATOR "NSIS" "ZIP")
981981
set(CPACK_PACKAGE_EXECUTABLES "GammaRay" "GammaRay")
982982
set(CPACK_PACKAGE_INSTALL_DIRECTORY "GammaRay")
983983
set(CPACK_PACKAGE_FILE_NAME "GammaRay ${GAMMARAY_VERSION}")
984984
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/${LICENSE_FILE}")
985985
set(CPACK_NSIS_EXECUTABLES_DIRECTORY "${BIN_INSTALL_DIR}")
986+
set(CPACK_NSIS_MANIFEST_DPI_AWARE TRUE)
986987
set(CPACK_NSIS_MUI_ICON "${ICONS_DIR}/GammaRay.ico")
987-
#set(CPACK_PACKAGE_ICON "${ICONS_DIR}\\\\CharmNSISHeader.bmp")
988+
#set(CPACK_PACKAGE_ICON "${ICONS_DIR}/TODO.bmp")
988989
set(CPACK_NSIS_URL_INFO_ABOUT "https://www.kdab.com/")
989990
set(CPACK_NSIS_INSTALLED_ICON_NAME "GammaRay${CMAKE_EXECUTABLE_SUFFIX}")
990991
set(CPACK_NSIS_MENU_LINKS "${LICENSE_FILE}" "License" "${README_FILE}" "Readme")
@@ -995,9 +996,9 @@ elseif(APPLE)
995996
set(CPACK_DMG_VOLUME_NAME "GammaRay")
996997
set(CPACK_SYSTEM_NAME "OSX")
997998
set(CPACK_PACKAGE_FILE_NAME "GammaRay-${GAMMARAY_VERSION}")
998-
set(CPACK_PACKAGE_ICON "${ICONS_DIR}/CharmDMG.icns")
999-
set(CPACK_DMG_DS_STORE "${ICONS_DIR}/CharmDSStore")
1000-
set(CPACK_DMG_BACKGROUND_IMAGE "${ICONS_DIR}/CharmDMGBackground.png")
999+
set(CPACK_PACKAGE_ICON "${ICONS_DIR}/GammaRay.icns")
1000+
# set(CPACK_DMG_DS_STORE "${ICONS_DIR}/TODO_DSStore")
1001+
# set(CPACK_DMG_BACKGROUND_IMAGE "${ICONS_DIR}/TODO_DMGBackground.png")
10011002
elseif(UNIX)
10021003
set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
10031004
endif()

0 commit comments

Comments
 (0)