Remove sudo, rename CPack scripts

tresf · May 15, 2024 · 956d080 · 956d080
1 parent 4b2dedf
commit 956d080
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Update cmake
         run: |
-          sudo snap install cmake --classic
+          snap install cmake --classic
           alias cmake='snap run cmake'
       - name: Check out
         uses: actions/checkout@v3

diff --git a/cmake/apple/CMakeLists.txt b/cmake/apple/CMakeLists.txt
@@ -19,7 +19,7 @@ set(CPACK_STRIP_FILES_ORIG "${CPACK_STRIP_FILES}" PARENT_SCOPE)
 set(CPACK_STRIP_FILES false PARENT_SCOPE)
 set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}-mac${APPLE_OS_VER}")
 set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}" PARENT_SCOPE)
-set(CPACK_PRE_BUILD_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/CPackDMG.cmake" PARENT_SCOPE)
+set(CPACK_PRE_BUILD_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/MacDeployQt.cmake" PARENT_SCOPE)
 set(CPACK_DMG_VOLUME_NAME "${PROJECT_NAME_UCASE} ${VERSION}" PARENT_SCOPE)
 set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_BINARY_DIR}/${SUBDIR}/background.tiff" PARENT_SCOPE)
 set(CPACK_DMG_DS_STORE "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/DS_Store" PARENT_SCOPE)

diff --git a/cmake/apple/CPackDMG.cmake → cmake/apple/MacDeployQt.cmake b/cmake/apple/CPackDMG.cmake → cmake/apple/MacDeployQt.cmake
diff --git a/cmake/linux/CMakeLists.txt b/cmake/linux/CMakeLists.txt
@@ -44,7 +44,7 @@ else()
 	set(CPACK_TARGET_ARCH unknown PARENT_SCOPE)
 endif()
 
-set(CPACK_PRE_BUILD_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/CPackAppImage.cmake" PARENT_SCOPE)
+set(CPACK_PRE_BUILD_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/LinuxDeployQt.cmake" PARENT_SCOPE)
 
 if(CMAKE_VERSION VERSION_LESS "3.19")
     message(WARNING "DMG creation requires at least CMake 3.19")

diff --git a/cmake/linux/CPackAppImage.cmake → cmake/linux/LinuxDeployQt.cmake b/cmake/linux/CPackAppImage.cmake → cmake/linux/LinuxDeployQt.cmake