From 7c17857e74eeacd0a3d011f2301bbe829ef7ac56 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 25 May 2023 18:12:37 +0200 Subject: [PATCH] Fix cmake whitespace, disable cmake-format Signed-off-by: falkTX --- cmake/.cmake-format.json | 5 +++++ cmake/CMakeLists.txt | 24 ++++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 cmake/.cmake-format.json diff --git a/cmake/.cmake-format.json b/cmake/.cmake-format.json new file mode 100644 index 000000000..feaedf24f --- /dev/null +++ b/cmake/.cmake-format.json @@ -0,0 +1,5 @@ +{ + "format": { + "disable": true + } +} diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index acaf46590..2ecab03a9 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -51,7 +51,7 @@ find_package(PkgConfig) # homebrew does not support universal binaries, disable external deps if it is in use if(APPLE) find_program(HOMEBREW brew) - if (HOMEBREW) + if(HOMEBREW) set(PKGCONFIG_FOUND FALSE) mark_as_advanced(PKGCONFIG_FOUND) endif() @@ -205,7 +205,9 @@ set_common_target_properties(carla-lilv_serd) target_compile_options(carla-lilv_serd PRIVATE - $<$:/wd4005 /wd4090 /wd4133> + $<$:/wd4005> + $<$:/wd4090> + $<$:/wd4133> $<$:-Wno-format-overflow> $<$:-Wno-implicit-fallthrough> ) @@ -229,7 +231,9 @@ set_common_target_properties(carla-lilv_sord) target_compile_options(carla-lilv_sord PRIVATE - $<$:/wd4005 /wd4090 /wd4133> + $<$:/wd4005> + $<$:/wd4090> + $<$:/wd4133> $<$:-Wno-maybe-uninitialized> $<$:-Wno-unused-parameter> # workaround compiler bug, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109585 @@ -261,7 +265,9 @@ set_common_target_properties(carla-lilv_sratom) target_compile_options(carla-lilv_sratom PRIVATE - $<$:/wd4005 /wd4090 /wd4133> + $<$:/wd4005> + $<$:/wd4090> + $<$:/wd4133> ) target_include_directories(carla-lilv_sratom @@ -288,7 +294,9 @@ set_common_target_properties(carla-lilv_lilv) target_compile_options(carla-lilv_lilv PRIVATE - $<$:/wd4005 /wd4090 /wd4133> + $<$:/wd4005> + $<$:/wd4090> + $<$:/wd4133> $<$:-Wno-incompatible-pointer-types-discards-qualifiers> $<$:-Wno-deprecated-declarations> $<$:-Wno-discarded-qualifiers> @@ -543,10 +551,6 @@ target_include_directories(carla-ysfx ../source/modules/ysfx/thirdparty/WDL/source ) -target_link_libraries(carla-ysfx - PRIVATE -) - target_sources(carla-ysfx PRIVATE ../source/modules/ysfx/sources/ysfx.cpp @@ -843,7 +847,7 @@ target_sources(carla-utils ####################################################################################################################### -if (APPLE) +if(APPLE) set_source_files_properties( ../source/backend/CarlaStandalone.cpp ../source/backend/plugin/CarlaPluginCLAP.cpp