diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-11 15:17:02 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-02-11 15:17:02 +0100 |
| commit | 092ff2f48876846cf25ae75bf9e719efb943971b (patch) | |
| tree | 33df9d873a47a48131d74f81ed7a07c489b6972c /CMakeLists.txt | |
| parent | 63eed1637be7129c4d81f801f6b37233c233d5ac (diff) | |
| parent | 8f265f3992cba30dc0ae1f56865811da97723657 (diff) | |
Merge branch 'master' of github.com:mixxxdj/mixxx into serato-library-feature
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d9d4482aef..10e694ae4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,7 +117,11 @@ else() message(STATUS "Support for ccache: ${CCACHE_SUPPORT}") endif() +set_property(DIRECTORY APPEND + PROPERTY CMAKE_CONFIGURE_DEPENDS + "${CMAKE_SOURCE_DIR}/.git/index") +# uses GIT_BRANCH and GIT_COMMIT_COUNT configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/src/build.h.template" "${CMAKE_CURRENT_BINARY_DIR}/src/build.h" @@ -692,16 +696,19 @@ if(UNIX AND NOT APPLE) endif() # Disable warnings in generated source files -set_property( - SOURCE src/library/rekordbox/rekordbox_anlz.cpp - APPEND_STRING - PROPERTY COMPILE_OPTIONS -Wno-unused-parameter -) -set_property( - SOURCE src/library/rekordbox/rekordbox_pdb.cpp - APPEND_STRING - PROPERTY COMPILE_OPTIONS -Wno-unused-parameter -Wno-switch -) +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" # GNU is GNU GCC + OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + set_property( + SOURCE src/library/rekordbox/rekordbox_anlz.cpp + APPEND_STRING + PROPERTY COMPILE_OPTIONS -Wno-unused-parameter + ) + set_property( + SOURCE src/library/rekordbox/rekordbox_pdb.cpp + APPEND_STRING + PROPERTY COMPILE_OPTIONS -Wno-unused-parameter -Wno-switch + ) +endif() option(WARNINGS_PEDANTIC "Let the compiler show even more warnings" OFF) if(MSVC) @@ -955,6 +962,7 @@ add_executable(mixxx-test src/test/readaheadmanager_test.cpp src/test/replaygaintest.cpp src/test/rescalertest.cpp + src/test/rgbcolor_test.cpp src/test/samplebuffertest.cpp src/test/sampleutiltest.cpp src/test/schemamanager_test.cpp @@ -1207,6 +1215,9 @@ add_library(MP3GuessEnc STATIC EXCLUDE_FROM_ALL lib/mp3guessenc-0.27.4/decode.c lib/mp3guessenc-0.27.4/bit_utils.c ) +if(WIN32) + target_compile_definitions(MP3GuessEnc PRIVATE __WINDOWS__) +endif() target_include_directories(MP3GuessEnc SYSTEM PUBLIC lib/mp3guessenc-0.27.4) target_link_libraries(mixxx-lib PUBLIC MP3GuessEnc) |