diff options
| author | Be <be@mixxx.org> | 2020-04-24 22:25:55 -0500 |
|---|---|---|
| committer | Be <be@mixxx.org> | 2020-04-24 22:25:55 -0500 |
| commit | 082908fe72eb4beae3da3a4215fe966edec6a27a (patch) | |
| tree | 342ca45c32f0bb757d614aa8a6e27a3934ef1d42 /CMakeLists.txt | |
| parent | 44f11ef4472b8b4094545d40bf757afe4ce61747 (diff) | |
| parent | f6dc97726a7895c9dabade017e0e93c33b337eaa (diff) | |
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 70e775d835..0f4a732eb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -356,6 +356,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/library/baseplaylistfeature.cpp src/library/basesqltablemodel.cpp src/library/basetrackcache.cpp + src/library/basetracksetfeature.cpp src/library/basetracktablemodel.cpp src/library/bpmdelegate.cpp src/library/browse/browsefeature.cpp @@ -1248,8 +1249,11 @@ option(STATIC_DEPS "Link dependencies statically" OFF) # Chromaprint find_package(Chromaprint REQUIRED) target_link_libraries(mixxx-lib PUBLIC Chromaprint::Chromaprint) -if(WIN32 AND STATIC_DEPS) - target_compile_definitions(mixxx-lib PUBLIC CHROMAPRINT_NODLL) +if(WIN32) + if(STATIC_DEPS) + target_compile_definitions(mixxx-lib PUBLIC CHROMAPRINT_NODLL) + endif() + # Rubberband is always built statically and needs fftw. find_package(FFTW REQUIRED) target_link_libraries(mixxx-lib PUBLIC FFTW::FFTW) endif() @@ -1511,6 +1515,12 @@ elseif(WIN32) target_link_libraries(mixxx-lib PUBLIC "${QTLIBPNG_LIBRARY}") find_library(QTPCRE2_LIBRARY qtpcre2) target_link_libraries(mixxx-lib PUBLIC "${QTPCRE2_LIBRARY}") + else() + #libshout is always built statically + target_link_libraries(mixxx-lib PUBLIC + ws2_32 # libshout + gdi32 # libshout + ) endif() endif() @@ -1594,7 +1604,8 @@ if(SndFile_SUPPORTS_SET_COMPRESSION_LEVEL) target_compile_definitions(mixxx-lib PUBLIC SFC_SUPPORTS_SET_COMPRESSION_LEVEL) endif() -if(WIN32 AND STATIC_DEPS) +#libsndfile is always build statically, so we don't check for STATIC_DEPS +if(WIN32) find_package(G72X REQUIRED) target_link_libraries(mixxx-lib PUBLIC G72X::G72X) endif() @@ -1891,7 +1902,8 @@ if(OPUS) target_compile_definitions(mixxx-lib PUBLIC __OPUS__) target_include_directories(mixxx-lib SYSTEM PUBLIC ${Opus_INCLUDE_DIRS}) target_link_libraries(mixxx-lib PUBLIC ${Opus_LIBRARIES}) - if(WIN32 AND STATIC_DEPS) + # Opus is always built statically so we don't check STATIC_DEPS + if(WIN32) find_package(Celt) if(NOT Celt_FOUND) message(FATAL_ERROR "Opus support with static dependencies requires the celt library.") @@ -2126,6 +2138,8 @@ if(NOT OPTIMIZE STREQUAL "off") # Jenkins logs) Should we turn on PGO ? # http://msdn.microsoft.com/en-us/library/xbf3tbeh.aspx target_link_options(mixxx-lib PUBLIC "/LTCG:OFF") + elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_options(mixxx-lib PUBLIC "/GL-") else() target_compile_options(mixxx-lib PUBLIC "/GL") target_link_options(mixxx-lib PUBLIC "/LTCG:NOSTATUS") |