Skip to content

Commit

Permalink
Make djinterop explicit opt-in.
Browse files Browse the repository at this point in the history
Add -DDJINTEROP=ON to Ubuntu/CMake travis and appveyor builds.
Add shallow git clone.
  • Loading branch information
mr-smidge committed Jul 12, 2020
1 parent 3bd92eb commit 0aa65b2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
cache: ccache
# Ubuntu Bionic build prerequisites
# TODO for Ubuntu Focal: Replace "-DFAAD=ON" with "-DFFMPEG=ON"
env: CMAKEFLAGS_EXTRA="-DFAAD=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON -DWARNINGS_FATAL=ON"
env: CMAKEFLAGS_EXTRA="-DDJINTEROP=ON -DFAAD=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON -DWARNINGS_FATAL=ON"
before_install:
- export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)"
- export CTEST_PARALLEL_LEVEL="$(nproc)"
Expand Down
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1438,8 +1438,8 @@ if(WIN32)
target_link_libraries(mixxx-lib PUBLIC FFTW::FFTW)
endif()

# libdjinterop (enabled only on UNIX for now)
cmake_dependent_option(DJINTEROP "Use djinterop library" ON "UNIX;NOT APPLE" OFF)
# libdjinterop (must be enabled explicitly to use)
option(DJINTEROP "Use djinterop library" OFF)
if(DJINTEROP)
message(STATUS "Enabling djinterop support...")
target_compile_definitions(mixxx-lib PUBLIC __DJINTEROP__)
Expand Down Expand Up @@ -1470,6 +1470,7 @@ if(DJINTEROP)
ExternalProject_Add(libdjinterop
GIT_REPOSITORY ${DJINTEROP_GIT_REPO_URL}
GIT_TAG ${DJINTEROP_GIT_TAG}
GIT_SHALLOW TRUE
CONFIGURE_COMMAND meson setup --prefix ${DJINTEROP_INSTALL_DIR} --libdir lib --includedir include build <SOURCE_DIR>
BUILD_COMMAND meson compile -C build
INSTALL_COMMAND meson install -C build
Expand All @@ -1479,6 +1480,7 @@ if(DJINTEROP)
ExternalProject_Add(libdjinterop
GIT_REPOSITORY ${DJINTEROP_GIT_REPO_URL}
GIT_TAG ${DJINTEROP_GIT_TAG}
GIT_SHALLOW TRUE
INSTALL_DIR ${DJINTEROP_INSTALL_DIR}
CMAKE_ARGS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
EXCLUDE_FROM_ALL TRUE
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ for:
-DBATTERY=ON
-DBROADCAST=ON
-DBULK=ON
-DDJINTEROP=ON
-DFFMPEG=ON
-DHID=ON
-DLILV=ON
Expand Down

0 comments on commit 0aa65b2

Please sign in to comment.