diff options
| author | Adam Szmigin <smidge@xsco.net> | 2020-07-13 21:57:42 +0100 |
|---|---|---|
| committer | Adam Szmigin <smidge@xsco.net> | 2020-07-13 21:57:42 +0100 |
| commit | 3c73b2a48e59b0ee6f944d73dca8af1a7dacbee3 (patch) | |
| tree | 9e26f6efd4a6233fb3aba2fbfe347e312434a6fd | |
| parent | 5f7b77c676bec8c0a6679eeabdc20ad226a47fa1 (diff) | |
Build options named by feature rather than dependency
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | appveyor.yml | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 03b21e1102..f460f684c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,7 @@ jobs: cache: ccache # Ubuntu Bionic build prerequisites # TODO for Ubuntu Focal: Replace "-DFAAD=ON" with "-DFFMPEG=ON" - env: CMAKEFLAGS_EXTRA="-DDJINTEROP=ON -DFAAD=ON -DLOCALECOMPARE=ON -DMAD=ON -DMODPLUG=ON -DWAVPACK=ON -DWARNINGS_FATAL=ON" + env: CMAKEFLAGS_EXTRA="-DENGINEPRIME=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)" diff --git a/CMakeLists.txt b/CMakeLists.txt index 74d6214a91..0a1964167a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1438,11 +1438,10 @@ if(WIN32) target_link_libraries(mixxx-lib PUBLIC FFTW::FFTW) endif() -# 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__) +# Denon Engine Prime library export support (using libdjinterop) +option(ENGINEPRIME "Support for library export to Denon Engine Prime" OFF) +if(ENGINEPRIME) + target_compile_definitions(mixxx-lib PUBLIC __ENGINEPRIME__) # Look for an existing installation of libdjinterop and use that if available. # Otherwise, download and build from GitHub. diff --git a/appveyor.yml b/appveyor.yml index e0c4201476..283c756971 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -115,7 +115,7 @@ for: -DBATTERY=ON -DBROADCAST=ON -DBULK=ON - -DDJINTEROP=ON + -DENGINEPRIME=ON -DFFMPEG=ON -DHID=ON -DLILV=ON |