Skip to content

Commit

Permalink
Upgrade cmake; fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
tresf committed May 15, 2024
1 parent 9560110 commit bad79a8
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ jobs:
steps:
- name: Configure git
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Update cmake
run: |
sudo snap install cmake --classic
alias cmake='snap run cmake'
- name: Check out
uses: actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ ELSE()
ENDIF(WANT_DEBUG_FPE)

if(WANT_DEBUG_CPACK)
if(LMMS_BUILD_WIN32 OR WANT_CPACK_TARBALL)
if((LMMS_BUILD_WIN32 AND CMAKE_VERSION VERSION_LESS "3.19") OR WANT_CPACK_TARBALL)
set(STATUS_DEBUG_CPACK "Wanted but disabled due to unsupported configuration")
else()
set(CPACK_DEBUG TRUE)
Expand Down
2 changes: 1 addition & 1 deletion cmake/linux/CPackAppImage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ execute_process(COMMAND "${LINUXDEPLOYQT_BIN}" "${DESKTOP_FILE}" ${EXECUTABLES}
-bundle-non-qt-libs
-verbose=${VERBOSITY}
${NO_STRIP}
COMMAND_ECHO ${COMMAND_ECHO})
COMMAND_ECHO ${COMMAND_ECHO}
COMMAND_ERROR_IS_FATAL ANY)
#-unsupported-allow-new-glibc

Expand Down
5 changes: 5 additions & 0 deletions cmake/nsis/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ SET(CPACK_NSIS_DEFINES "${CPACK_NSIS_DEFINES}" PARENT_SCOPE)
SET(CPACK_PACKAGE_ICON "${CPACK_PACKAGE_ICON}" PARENT_SCOPE)
SET(CPACK_NSIS_MUI_ICON "${CPACK_NSIS_MUI_ICON}" PARENT_SCOPE)

if(CPACK_DEBUG)
# CMake 3.19+
set(CPACK_NSIS_EXECUTABLE_PRE_ARGUMENTS "-V4")
endif()

# Windows resource compilers
CONFIGURE_FILE("lmms.rc.in" "${CMAKE_BINARY_DIR}/lmms.rc")
CONFIGURE_FILE("zynaddsubfx.rc.in" "${CMAKE_BINARY_DIR}/plugins/ZynAddSubFx/zynaddsubfx.rc")
Expand Down

0 comments on commit bad79a8

Please sign in to comment.