Skip to content

Commit

Permalink
Merge pull request mixxxdj#3226 from uklotzde/libkeyfinder_bundled
Browse files Browse the repository at this point in the history
Download libKeyFinder before build
  • Loading branch information
Holzhaus authored Oct 29, 2020
2 parents 83b7eb5 + 9feb288 commit b491392
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1530,10 +1530,11 @@ if(KEYFINDER)
find_package(FFTW REQUIRED)
set(KeyFinder_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/lib/keyfinder-install")
set(KeyFinder_LIBRARY "lib/${CMAKE_STATIC_LIBRARY_PREFIX}keyfinder${CMAKE_STATIC_LIBRARY_SUFFIX}")
ExternalProject_Add(keyfinder
GIT_REPOSITORY https://github.com/ibsh/libKeyFinder.git
GIT_TAG v2.2.2
GIT_SHALLOW TRUE
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/download")
ExternalProject_Add(libKeyFinder
URL "https://github.com/ibsh/libKeyFinder/archive/v2.2.2.zip"
URL_HASH SHA256=f04ff63c9710d969e79b71bde18abd720e886f537951a1045cc50cb497a72492
DOWNLOAD_DIR "${CMAKE_CURRENT_BINARY_DIR}/download/libKeyFinder"
INSTALL_DIR "${KeyFinder_INSTALL_DIR}"
CMAKE_ARGS
-DBUILD_STATIC_LIBS=ON
Expand All @@ -1557,7 +1558,7 @@ if(KEYFINDER)
file(MAKE_DIRECTORY "${KeyFinder_INSTALL_DIR}/include")

add_library(mixxx-keyfinder STATIC IMPORTED)
add_dependencies(mixxx-keyfinder keyfinder)
add_dependencies(mixxx-keyfinder libKeyFinder)
set_target_properties(mixxx-keyfinder PROPERTIES IMPORTED_LOCATION "${KeyFinder_INSTALL_DIR}/${KeyFinder_LIBRARY}")
target_link_libraries(mixxx-keyfinder INTERFACE FFTW::FFTW)
target_include_directories(mixxx-keyfinder INTERFACE "${KeyFinder_INSTALL_DIR}/include")
Expand Down

0 comments on commit b491392

Please sign in to comment.