diff options
author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-03-09 11:14:37 +0100 |
---|---|---|
committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-03-09 11:17:55 +0100 |
commit | 20ce76f02f5c67190e5dcc2575656a31083658c6 (patch) | |
tree | d933204664affc85cb415fce2355c3f90157427b /CMakeLists.txt | |
parent | 90b1109d32edad4c055c01406e0cfadfb5939b39 (diff) | |
parent | 7a3095d87adb27e7d6a162b1cd0f0f376eb474f7 (diff) |
Merge branch 'master' of github.com:mixxxdj/mixxx into hotcue-rgb-colors
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 52d1975186..6b9a320981 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,13 +426,16 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/mixer/samplerbank.cpp src/mixxx.cpp src/mixxxapplication.cpp - src/musicbrainz/acoustidclient.cpp src/musicbrainz/chromaprinter.cpp src/musicbrainz/crc.c src/musicbrainz/gzip.cpp - src/musicbrainz/musicbrainzclient.cpp - src/musicbrainz/network.cpp + src/musicbrainz/musicbrainz.cpp + src/musicbrainz/musicbrainzxml.cpp src/musicbrainz/tagfetcher.cpp + src/musicbrainz/web/acoustidlookuptask.cpp + src/musicbrainz/web/musicbrainzrecordingstask.cpp + src/network/jsonwebtask.cpp + src/network/webtask.cpp src/preferences/broadcastprofile.cpp src/preferences/broadcastsettings.cpp src/preferences/broadcastsettings_legacy.cpp @@ -522,6 +525,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/track/replaygain.cpp src/track/serato/markers.cpp src/track/serato/markers2.cpp + src/track/serato/tags.cpp src/track/track.cpp src/track/trackfile.cpp src/track/trackinfo.cpp @@ -934,6 +938,7 @@ add_executable(mixxx-test src/test/coverartcache_test.cpp src/test/coverartutils_test.cpp src/test/cratestorage_test.cpp + src/test/cue_test.cpp src/test/cuecontrol_test.cpp src/test/dbconnectionpool_test.cpp src/test/dbidtest.cpp @@ -981,6 +986,7 @@ add_executable(mixxx-test src/test/searchqueryparsertest.cpp src/test/seratomarkerstest.cpp src/test/seratomarkers2test.cpp + src/test/seratotagstest.cpp src/test/signalpathtest.cpp src/test/skincontext_test.cpp src/test/softtakeover_test.cpp |