From f4f10c11fcfb6adb5dade1637719b25bd19dd8f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 2 May 2020 22:55:06 +0200 Subject: [PATCH] 3rdparty/cmake: Do not reset CMAKE_C(XX)_FLAGS (#4080) CMake 3rdparty: Do not overwrite CMAKE_C(XX)_FLAGS Co-authored-by: tresf --- src/3rdparty/CMakeLists.txt | 5 ++--- src/3rdparty/rpmalloc/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt index d546fd06e..19e49c344 100644 --- a/src/3rdparty/CMakeLists.txt +++ b/src/3rdparty/CMakeLists.txt @@ -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() diff --git a/src/3rdparty/rpmalloc/CMakeLists.txt b/src/3rdparty/rpmalloc/CMakeLists.txt index 23d1551c2..da6e7223e 100644 --- a/src/3rdparty/rpmalloc/CMakeLists.txt +++ b/src/3rdparty/rpmalloc/CMakeLists.txt @@ -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