From 4ea3ce6af02624a85784fbee8e9f5983038138e7 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Fri, 14 Mar 2025 14:38:53 -0400 Subject: [PATCH] fix ci --- src/CMakeLists.txt | 105 +++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 52 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 389214e..a1df16b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -130,62 +130,63 @@ if (WIN32) # Windows # Set icon for the splash image used in Windows NSIS installers. set(CPACK_PACKAGE_ICON "${QTK_RESOURCES}/icons/win/kilroy_splash.bmp") - set(CPACK_NSIS_MODIFY_PATH ON) - set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) - # https://nsis.sourceforge.io/Reference/CreateShortCut - set( - CPACK_NSIS_CREATE_ICONS_EXTRA - "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Qtk.lnk' '$INSTDIR\\\\bin\\\\qtk_gui.exe'" - ) - set( - CPACK_NSIS_DELETE_ICONS_EXTRA - "Delete '$SMPROGRAMS\\\\$START_MENU\\\\Qtk.lnk'" - ) - - # Set icon for the installer executable. -# set(CPACK_NSIS_MUI_ICON "${QTK_RESOURCES}/icons/win/kilroy.ico") - # Set icon for uninstaller executable. -# set(CPACK_NSIS_MUI_UNIICON "${QTK_RESOURCES}/icons/win/kilroy.ico") elseif(APPLE) - # OSX - # Set icon for the splash image used in OSX DMG installers. set(CPACK_PACKAGE_ICON "${QTK_RESOURCES}/icons/osx/kilroy_splash.bmp") - - # Set additional options for the OSX bundle. - set(CPACK_BUNDLE_NAME ${PROJECT_NAME}) - set(CPACK_BUNDLE_PLIST $/Info.plist) - set(CPACK_BUNDLE_ICON ${QTK_OSX_ICONS}) -else(UNIX) - # Linux - # Install icons for qtk. - install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-16.png - DESTINATION /usr/share/icons/hicolor/16x16/apps - RENAME qtk.png) - install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-32.png - DESTINATION /usr/share/icons/hicolor/32x32/apps - RENAME qtk.png) - install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-48.png - DESTINATION /usr/share/icons/hicolor/48x48/apps - RENAME qtk.png) - install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-64.png - DESTINATION /usr/share/icons/hicolor/64x64/apps - RENAME qtk.png) - install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-128.png - DESTINATION /usr/share/icons/hicolor/128x128/apps - RENAME qtk.png) - install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-256.png - DESTINATION /usr/share/icons/hicolor/256x256/apps - RENAME qtk.png) - - # Install the desktop file for qtk. - install(FILES ${QTK_RESOURCES}/qtk.desktop - DESTINATION /usr/share/applications) - - # Set additional options for the debian APT package. - set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL}) - set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) endif() +set(CPACK_NSIS_MODIFY_PATH ON) +set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) +# https://nsis.sourceforge.io/Reference/CreateShortCut +set( + CPACK_NSIS_CREATE_ICONS_EXTRA + "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Qtk.lnk' '$INSTDIR\\\\bin\\\\qtk_gui.exe'" +) +set( + CPACK_NSIS_DELETE_ICONS_EXTRA + "Delete '$SMPROGRAMS\\\\$START_MENU\\\\Qtk.lnk'" +) + +# Set icon for the installer executable. +# set(CPACK_NSIS_MUI_ICON "${QTK_RESOURCES}/icons/win/kilroy.ico") +# Set icon for uninstaller executable. +# set(CPACK_NSIS_MUI_UNIICON "${QTK_RESOURCES}/icons/win/kilroy.ico") +# OSX +# Set icon for the splash image used in OSX DMG installers. + +# Set additional options for the OSX bundle. +set(CPACK_BUNDLE_NAME ${PROJECT_NAME}) +set(CPACK_BUNDLE_PLIST $/Info.plist) +set(CPACK_BUNDLE_ICON ${QTK_OSX_ICONS}) + +# Linux +# Install icons for qtk. +install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-16.png + DESTINATION /usr/share/icons/hicolor/16x16/apps + RENAME qtk.png) +install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-32.png + DESTINATION /usr/share/icons/hicolor/32x32/apps + RENAME qtk.png) +install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-48.png + DESTINATION /usr/share/icons/hicolor/48x48/apps + RENAME qtk.png) +install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-64.png + DESTINATION /usr/share/icons/hicolor/64x64/apps + RENAME qtk.png) +install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-128.png + DESTINATION /usr/share/icons/hicolor/128x128/apps + RENAME qtk.png) +install(FILES ${QTK_RESOURCES}/icons/linux/kilroy-256.png + DESTINATION /usr/share/icons/hicolor/256x256/apps + RENAME qtk.png) + +# Install the desktop file for qtk. +install(FILES ${QTK_RESOURCES}/qtk.desktop + DESTINATION /usr/share/applications) + +# Set additional options for the debian APT package. +set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL}) +set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) + # Platform defaults for source bundles. if(WIN32) set(CPACK_SOURCE_GENERATOR ZIP)