Skip to content

3rdparty/cmake: Do not reset CMAKE_C(XX)_FLAGS #4080

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
tresf merged 3 commits into from
May 2, 2020
Merged

3rdparty/cmake: Do not reset CMAKE_C(XX)_FLAGS #4080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97dc9f2
CMake 3rdparty: Do not overwrite CMAKE_C(XX)_FLAGS
schnitzeltony Jun 11, 2019
1dd1147
Attempt to fix Travis
tresf May 2, 2020
f063834
Don't fail on Qt deprecation warnings
tresf May 2, 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
5 changes: 2 additions & 3 deletions src/3rdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
set(CMAKE_C_FLAGS "")
set(CMAKE_CXX_FLAGS "")

# TODO: Move submodules to dedicated directories for flag control
IF(QT5 AND LMMS_BUILD_LINUX AND WANT_VST)
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
add_subdirectory(qt5-x11embed)
ENDIF()

Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/rpmalloc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(CMAKE_C_FLAGS "-std=c11")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wno-unused-variable")

add_library(rpmalloc STATIC
rpmalloc/rpmalloc/rpmalloc.c
Expand Down