From 26afbcd4557cbf4367626028b77e2ef180fba0ad Mon Sep 17 00:00:00 2001 From: Paul Fd Date: Wed, 11 Mar 2020 15:32:32 +0100 Subject: [PATCH] Move and clean up standards --- cmake/SfizzConfig.cmake | 6 ++---- lv2/CMakeLists.txt | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cmake/SfizzConfig.cmake b/cmake/SfizzConfig.cmake index 52a2a587..81184a87 100644 --- a/cmake/SfizzConfig.cmake +++ b/cmake/SfizzConfig.cmake @@ -1,7 +1,5 @@ -# Do not override the C++ standard if set to more than 11 -if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 11) - set(CMAKE_CXX_STANDARD 11) -endif() +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_C_STANDARD 99) # Export the compile_commands.json file set (CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/lv2/CMakeLists.txt b/lv2/CMakeLists.txt index 240298fe..aa732cb4 100644 --- a/lv2/CMakeLists.txt +++ b/lv2/CMakeLists.txt @@ -3,9 +3,6 @@ set (LV2PLUGIN_PRJ_NAME "${PROJECT_NAME}_lv2") # Set the build directory as /lv2/.lv2/ set (PROJECT_BINARY_DIR "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.lv2") -# C99 or higher is needed -set(CMAKE_C_STANDARD 99) - # LV2 plugin specific settings include (LV2Config)