From f5ecddbb1f591a74344ac6dcff8690ca1bf4be0c Mon Sep 17 00:00:00 2001 From: Lukas W Date: Tue, 12 May 2020 11:32:37 +0200 Subject: [PATCH] Fix Windows rpmalloc compile flags --- src/3rdparty/rpmalloc/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/rpmalloc/CMakeLists.txt b/src/3rdparty/rpmalloc/CMakeLists.txt index da6e7223e..3b3afa6d3 100644 --- a/src/3rdparty/rpmalloc/CMakeLists.txt +++ b/src/3rdparty/rpmalloc/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wno-unused-variable") - add_library(rpmalloc STATIC rpmalloc/rpmalloc/rpmalloc.c rpmalloc/rpmalloc/rpmalloc.h @@ -9,6 +7,14 @@ target_include_directories(rpmalloc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/rpmalloc/rpmalloc ) +set_property(TARGET rpmalloc PROPERTY C_STANDARD 11) + +IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") + target_compile_options(rpmalloc + PRIVATE -Wno-unused-variable + ) +endif() + if (NOT LMMS_BUILD_WIN32) target_compile_definitions(rpmalloc PRIVATE -D_GNU_SOURCE