diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-03-29 14:57:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 14:57:48 +0200 |
| commit | d7a5c3755dbb472bd1c75392e7b59668371eddb4 (patch) | |
| tree | cef9ea8937546c3eca20363bd5625151be71aad1 | |
| parent | 3f26160d086f3f2f3cbffb6c673003618989bc0f (diff) | |
| parent | 88716f20d1c023ff4eeb5fc93002d2e5839e314d (diff) | |
Merge pull request #3756 from daschuer/cmake316
Fix deb packages build on GitHub.
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95ceaf1427..c758f44ba8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -146,7 +146,7 @@ jobs: with: # This should always match the mininum required version in # our CMakeLists.txt - cmake-version: '3.13.x' + cmake-version: '3.16.x' - name: "[Windows] Set up MSVC Developer Command Prompt" if: runner.os == 'Windows' diff --git a/CMakeLists.txt b/CMakeLists.txt index d365f39f05..fe08a9cece 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13.0) +cmake_minimum_required(VERSION 3.16.0) project(mixxx VERSION 2.3.0) set(CMAKE_PROJECT_HOMEPAGE_URL "https://www.mixxx.org") set(CMAKE_PROJECT_DESCRIPTION "Mixxx is Free DJ software that gives you everything you need to perform live mixes.") @@ -2677,11 +2677,6 @@ set(CPACK_DEBIAN_PACKAGE_DESCRIPTION_MERGED "${CPACK_DEBIAN_PACKAGE_DESCRIPTION} string(PREPEND CPACK_DEBIAN_PACKAGE_DESCRIPTION_MERGED "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}" "\n") string(REPLACE "\n\n" "\n.\n" CPACK_DEBIAN_PACKAGE_DESCRIPTION_MERGED "${CPACK_DEBIAN_PACKAGE_DESCRIPTION_MERGED}") string(REPLACE "\n" "\n " CPACK_DEBIAN_PACKAGE_DESCRIPTION_MERGED "${CPACK_DEBIAN_PACKAGE_DESCRIPTION_MERGED}") -if("3.16.0" VERSION_GREATER CMAKE_VERSION) - # This hack is no longer required with cpack version 3.16.3 - set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_DEBIAN_PACKAGE_DESCRIPTION_MERGED}") - set(CPACK_PACKAGE_DESCRIPTION "${CPACK_DEBIAN_PACKAGE_DESCRIPTION_MERGED}") -endif() # The upstream version must not contain hyphen string(REPLACE "-" "~" CPACK_DEBIAN_UPSTREAM_VERSION "${MIXXX_VERSION}") |