Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake: Adjust the download directory and name of external dependencies #4511

Merged
merged 2 commits into from
Nov 12, 2021
Merged

CMake: Adjust the download directory and name of external dependencies #4511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfd6858
Adjust the download directory and name of external dependencies
uklotzde Nov 10, 2021
9e1bee3
Update libkeyfinder versions
uklotzde Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

* Improve robustness of file type detection by considering the actual MIME type of the content. [lp:1445885](https://bugs.launchpad.net/mixxx/+bug/1445885) [#4356](https://github.com/mixxxdj/mixxx/pull/4356) [#4357](https://github.com/mixxxdj/mixxx/pull/4357)

### Packaging

* Downloads of external dependencies are placed in build/downloads
* The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.4.zip instead of build/download/libkeyfinder/v2.2.4.zip
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.4.zip instead of build/download/libkeyfinder/v2.2.4.zip
* The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.5.zip instead of build/download/libkeyfinder/v2.2.5.zip


## [2.3.1](https://launchpad.net/mixxx/+milestone/2.3.1) (2021-09-29)

* Added mapping for the Numark DJ2GO2 Touch controller [#4108](https://github.com/mixxxdj/mixxx/pull/4108) [#4287](https://github.com/mixxxdj/mixxx/pull/4287)
Expand Down
12 changes: 8 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,7 +1808,8 @@ target_include_directories(mixxx-lib SYSTEM PUBLIC lib/fidlib)
target_link_libraries(mixxx-lib PRIVATE fidlib)

# KeyFinder
find_package(KeyFinder)
set(LIBKEYFINDER_VERSION 2.2.4)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
set(LIBKEYFINDER_VERSION 2.2.4)
set(LIBKEYFINDER_VERSION 2.2.5)

find_package(KeyFinder ${LIBKEYFINDER_VERSION})
option(KEYFINDER "KeyFinder support" ON)
if(KEYFINDER)
if (KeyFinder_FOUND)
Expand All @@ -1818,11 +1819,14 @@ if(KEYFINDER)
find_package(FFTW REQUIRED)
set(KeyFinder_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/lib/keyfinder-install")
set(KeyFinder_LIBRARY "${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}keyfinder${CMAKE_STATIC_LIBRARY_SUFFIX}")
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/download")
# For offline builds download the archive file from the URL and
# copy it into DOWNLOAD_DIR under DOWNLOAD_NAME prior to starting
# the configuration.
ExternalProject_Add(libkeyfinder
URL "https://github.com/mixxxdj/libkeyfinder/archive/v2.2.4.zip"
URL "https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v${LIBKEYFINDER_VERSION}.zip"
URL_HASH SHA256=cb3fea8c7213257281b6c7006b2430809f466ad8a1d485663324378d6fc0782c
DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/download/libkeyfinder"
DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/downloads"
DOWNLOAD_NAME "libkeyfinder-${LIBKEYFINDER_VERSION}.zip"
INSTALL_DIR "${KeyFinder_INSTALL_DIR}"
CMAKE_ARGS
-DBUILD_SHARED_LIBS=OFF
Expand Down
11 changes: 11 additions & 0 deletions res/linux/org.mixxx.Mixxx.metainfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,17 @@
#4357
</li>
</ul>
<p>
Packaging
</p>
<ul>
<li>
Downloads of external dependencies are placed in build/downloads
</li>
<li>
The sources for libkeyfinder are now expected in build/downloads/libkeyfinder-2.2.4.zip instead of build/download/libkeyfinder/v2.2.4.zip
</li>
</ul>
</description>
</release>
<release version="2.3.1" type="stable" date="2021-09-29" timestamp="1632873600">
Expand Down