Skip to content

Fix broken CMake builds on Windows #2490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 2 commits into from
Feb 7, 2020
Merged

Fix broken CMake builds on Windows #2490

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
304438f
CMake: Fix mp3guessenc with CMake on Windows
Holzhaus Feb 5, 2020
4f42f0f
CMake: Only disable warnings for rekordbox sources with gcc/clang
Holzhaus Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,16 +691,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)
Expand Down Expand Up @@ -1206,6 +1209,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)

Expand Down