Suppress warnings in third-party code (#7319)

2024-06-17 22:48:04 +01:00
parent 2adbb166b5
commit e76a99ee76
41 changed files with 396 additions and 207 deletions
--- a/plugins/CarlaBase/CMakeLists.txt
+++ b/plugins/CarlaBase/CMakeLists.txt
@@ -15,7 +15,7 @@ if(LMMS_HAVE_WEAKCARLA)
  SET(CARLA_NATIVE_LIB carla_native-plugin)

  ADD_LIBRARY(${CARLA_NATIVE_LIB} SHARED DummyCarla.cpp)
-  TARGET_INCLUDE_DIRECTORIES(${CARLA_NATIVE_LIB} PUBLIC ${CARLA_INCLUDE_DIRS})
+  target_include_directories(${CARLA_NATIVE_LIB} SYSTEM PUBLIC ${CARLA_INCLUDE_DIRS})
  INSTALL(TARGETS ${CARLA_NATIVE_LIB}
    LIBRARY DESTINATION "${PLUGIN_DIR}/optional"
    RUNTIME DESTINATION "${PLUGIN_DIR}/optional"
@@ -31,7 +31,7 @@ if(LMMS_HAVE_CARLA OR LMMS_HAVE_WEAKCARLA)
        SET(CARLA_INCLUDE_DIRS ${CARLA_INCLUDE_DIRS} PARENT_SCOPE)

        INCLUDE(BuildPlugin)
-        INCLUDE_DIRECTORIES(${CARLA_INCLUDE_DIRS})
+        include_directories(SYSTEM ${CARLA_INCLUDE_DIRS})
        LINK_DIRECTORIES(${CARLA_LIBRARY_DIRS})
        LINK_LIBRARIES(${CARLA_LIBRARIES})
        BUILD_PLUGIN(carlabase Carla.cpp Carla.h
--- a/plugins/CarlaBase/Carla.h
+++ b/plugins/CarlaBase/Carla.h
@@ -37,13 +37,13 @@

 // carla/source/includes
 #include "carlabase_export.h"
-#include "CarlaDefines.h"
+#include <CarlaDefines.h>
 #if CARLA_VERSION_HEX >= 0x010911
-    #include "CarlaNativePlugin.h"
+    #include <CarlaNativePlugin.h>
 #else
-    #include "CarlaBackend.h"
-    #include "CarlaNative.h"
-    #include "CarlaUtils.h"
+    #include <CarlaBackend.h>
+    #include <CarlaNative.h>
+    #include <CarlaUtils.h>
    CARLA_EXPORT
    const NativePluginDescriptor* carla_get_native_patchbay_plugin();

--- a/plugins/CarlaBase/DummyCarla.cpp
+++ b/plugins/CarlaBase/DummyCarla.cpp
@@ -1,6 +1,6 @@
 // A dummy Carla interface
 #define BUILDING_CARLA
-#include "CarlaNativePlugin.h"
+#include <CarlaNativePlugin.h>

 #ifndef CARLA_PLUGIN_EXPORT
 #define CARLA_PLUGIN_EXPORT CARLA_EXPORT
--- a/plugins/CarlaPatchbay/CMakeLists.txt
+++ b/plugins/CarlaPatchbay/CMakeLists.txt
@@ -1,7 +1,8 @@
 if(LMMS_HAVE_CARLA OR LMMS_HAVE_WEAKCARLA)
 	ADD_DEFINITIONS(-DCARLA_PLUGIN_PATCHBAY -DCARLA_PLUGIN_SYNTH)
 	INCLUDE(BuildPlugin)
-	INCLUDE_DIRECTORIES(${CARLA_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../CarlaBase")
+	include_directories(SYSTEM ${CARLA_INCLUDE_DIRS})
+	include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../CarlaBase")
 	LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../CarlaBase"
                          ${CARLA_LIBRARY_DIRS})
 	LINK_LIBRARIES(carlabase)
--- a/plugins/CarlaRack/CMakeLists.txt
+++ b/plugins/CarlaRack/CMakeLists.txt
@@ -1,7 +1,8 @@
 if(LMMS_HAVE_CARLA OR LMMS_HAVE_WEAKCARLA)
 	ADD_DEFINITIONS(-DCARLA_PLUGIN_RACK -DCARLA_PLUGIN_SYNTH)
 	INCLUDE(BuildPlugin)
-	INCLUDE_DIRECTORIES(${CARLA_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../CarlaBase")
+	include_directories(SYSTEM ${CARLA_INCLUDE_DIRS})
+	include_directories("${CMAKE_CURRENT_SOURCE_DIR}/../CarlaBase")
 	LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/../CarlaBase"
                          ${CARLA_LIBRARY_DIRS})
 	LINK_LIBRARIES(carlabase)
--- a/plugins/Eq/CMakeLists.txt
+++ b/plugins/Eq/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE(BuildPlugin)
-INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS})
+include_directories(SYSTEM ${FFTW3F_INCLUDE_DIRS})
 LINK_LIBRARIES(${FFTW3F_LIBRARIES})
 BUILD_PLUGIN(eq EqEffect.cpp EqCurve.cpp EqCurve.h EqControls.cpp EqControlsDialog.cpp EqFilter.h EqParameterWidget.cpp EqFader.h EqSpectrumView.h EqSpectrumView.cpp
 MOCFILES EqControls.h EqControlsDialog.h EqCurve.h EqParameterWidget.h EqFader.h EqSpectrumView.h EMBEDDED_RESOURCES *.png)
--- a/plugins/FreeBoy/CMakeLists.txt
+++ b/plugins/FreeBoy/CMakeLists.txt
@@ -1,21 +1,20 @@
-INCLUDE(BuildPlugin)
-INCLUDE_DIRECTORIES(game-music-emu/gme)
+include(BuildPlugin)

-BUILD_PLUGIN(freeboy
+add_library(gme STATIC
+	game-music-emu/gme/Gb_Apu.cpp
+	game-music-emu/gme/Gb_Oscs.cpp
+	game-music-emu/gme/Blip_Buffer.cpp
+	game-music-emu/gme/Multi_Buffer.cpp
+)
+target_include_directories(gme PUBLIC game-music-emu/gme)
+set_target_properties(gme PROPERTIES SYSTEM TRUE)
+
+build_plugin(freeboy
 	FreeBoy.cpp
 	FreeBoy.h
 	GbApuWrapper.cpp
 	GbApuWrapper.h
-	game-music-emu/gme/Gb_Apu.cpp
-	game-music-emu/gme/Gb_Apu.h
-	game-music-emu/gme/Gb_Oscs.cpp
-	game-music-emu/gme/Blip_Buffer.cpp
-	game-music-emu/gme/Gb_Oscs.h
-	game-music-emu/gme/blargg_common.h
-	game-music-emu/gme/Blip_Buffer.h
-	game-music-emu/gme/Multi_Buffer.cpp
-	game-music-emu/gme/blargg_source.h
-	game-music-emu/gme/Multi_Buffer.h
 	MOCFILES FreeBoy.h
 	EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png"
 )
+target_link_libraries(freeboy gme)
--- a/plugins/FreeBoy/FreeBoy.h
+++ b/plugins/FreeBoy/FreeBoy.h
@@ -26,8 +26,9 @@
 #ifndef LMMS_FREEBOY_H
 #define LMMS_FREEBOY_H

+#include <Blip_Buffer.h>
+
 #include "AutomatableModel.h"
-#include "Blip_Buffer.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
 #include "Graph.h"
--- a/plugins/FreeBoy/GbApuWrapper.h
+++ b/plugins/FreeBoy/GbApuWrapper.h
@@ -24,8 +24,8 @@
 #ifndef LMMS_GB_APU_WRAPPER_H
 #define LMMS_GB_APU_WRAPPER_H

-#include "Gb_Apu.h"
-#include "Multi_Buffer.h"
+#include <Gb_Apu.h>
+#include <Multi_Buffer.h>

 namespace lmms
 {
--- a/plugins/GigPlayer/CMakeLists.txt
+++ b/plugins/GigPlayer/CMakeLists.txt
@@ -1,6 +1,6 @@
 if(LMMS_HAVE_GIG)
 	INCLUDE(BuildPlugin)
-	INCLUDE_DIRECTORIES(${GIG_INCLUDE_DIRS})
+	include_directories(SYSTEM ${GIG_INCLUDE_DIRS})
 	SET(CMAKE_AUTOUIC ON)

 	# Required for not crashing loading files with libgig
--- a/plugins/LadspaEffect/calf/CMakeLists.txt
+++ b/plugins/LadspaEffect/calf/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Note:
 # 	The last version of Calf that was LADSPA-capable is version 0.0.18.2

+set_directory_properties(PROPERTIES SYSTEM TRUE)
+
 # Parse version info from autoconf
 FILE(READ veal/configure.ac VERSION_FILE)
 STRING(REPLACE "[" ";" VERSION_FILE ${VERSION_FILE} )
@@ -35,16 +37,12 @@ SET_TARGET_PROPERTIES(veal PROPERTIES PREFIX "")
 TARGET_COMPILE_DEFINITIONS(veal PRIVATE DISABLE_OSC=1)

 SET(INLINE_FLAGS "")
-SET(OTHER_FLAGS "")
 IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 	SET(INLINE_FLAGS -finline-functions-called-once -finline-limit=80)
-	SET(OTHER_FLAGS -Wno-format-overflow)
 ENDIF()

-if(MSVC)
-	target_compile_options(veal PRIVATE /wd4099 /wd4244 /wd4305)
-else()
-	target_compile_options(veal PRIVATE -fexceptions -O2 -finline-functions ${INLINE_FLAGS} ${OTHER_FLAGS})
+if(NOT MSVC)
+	target_compile_options(veal PRIVATE -fexceptions -O2 -finline-functions ${INLINE_FLAGS})
 endif()

 if(MSVC)
--- a/plugins/LadspaEffect/caps/CMakeLists.txt
+++ b/plugins/LadspaEffect/caps/CMakeLists.txt
@@ -1,3 +1,5 @@
+set_directory_properties(PROPERTIES SYSTEM TRUE)
+
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
 FILE(GLOB SOURCES *.cc)
 LIST(SORT SOURCES)
@@ -8,10 +10,8 @@ ADD_DEFINITIONS(-DLMMS_BUILD_WIN64)
 ENDIF(LMMS_BUILD_WIN64)
 SET_TARGET_PROPERTIES(caps PROPERTIES PREFIX "")

-if(MSVC)
-	target_compile_options(caps PRIVATE /wd4244 /wd4305)
-else()
-	target_compile_options(caps PRIVATE -O2 -funroll-loops -Wno-write-strings)
+if(NOT MSVC)
+	target_compile_options(caps PRIVATE -O2 -funroll-loops)
 endif()

 if(MSVC)
--- a/plugins/LadspaEffect/cmt/CMakeLists.txt
+++ b/plugins/LadspaEffect/cmt/CMakeLists.txt
@@ -1,3 +1,5 @@
+set_directory_properties(PROPERTIES SYSTEM TRUE)
+
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
 FILE(GLOB_RECURSE SOURCES cmt/src/*.cpp)
 LIST(SORT SOURCES)
@@ -6,10 +8,8 @@ INSTALL(TARGETS cmt LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")

 SET_TARGET_PROPERTIES(cmt PROPERTIES PREFIX "")

-if(MSVC)
-	target_compile_options(cmt PRIVATE /wd4244 /wd4305)
-else()
-	target_compile_options(cmt PRIVATE -Wall -O3 -fno-strict-aliasing)
+if(NOT MSVC)
+	target_compile_options(cmt PRIVATE -O3 -fno-strict-aliasing)
 endif()

 if(LMMS_BUILD_WIN32)
--- a/plugins/LadspaEffect/swh/CMakeLists.txt
+++ b/plugins/LadspaEffect/swh/CMakeLists.txt
@@ -1,3 +1,5 @@
+set_directory_properties(PROPERTIES SYSTEM TRUE)
+
 # Create blank config.h
 FILE(WRITE ladspa/config.h "")

@@ -9,10 +11,8 @@ ELSE()
 ENDIF()

 # Additional compile flags
-if(MSVC)
-	set(COMPILE_FLAGS ${COMPILE_FLAGS} /wd4244 /wd4273 /wd4305)
-else()
-	set(COMPILE_FLAGS ${COMPILE_FLAGS} -O3 -Wall -c
+if(NOT MSVC)
+	set(COMPILE_FLAGS ${COMPILE_FLAGS} -O3 -c
 		-fomit-frame-pointer -funroll-loops -ffast-math -fno-strict-aliasing
 		${PIC_FLAGS}
 	)
--- a/plugins/LadspaEffect/tap/CMakeLists.txt
+++ b/plugins/LadspaEffect/tap/CMakeLists.txt
@@ -1,10 +1,12 @@
+set_directory_properties(PROPERTIES SYSTEM TRUE)
+
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include")
 FILE(GLOB PLUGIN_SOURCES tap-plugins/*.c)
 LIST(SORT PLUGIN_SOURCES)
 if(MSVC)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4244 /fp:fast")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /fp:fast")
 else()
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-write-strings -fomit-frame-pointer -fno-strict-aliasing -funroll-loops -ffast-math")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -fomit-frame-pointer -fno-strict-aliasing -funroll-loops -ffast-math")
 endif()
 FOREACH(_item ${PLUGIN_SOURCES})
 	GET_FILENAME_COMPONENT(_plugin "${_item}" NAME_WE)
--- a/plugins/Lv2Effect/CMakeLists.txt
+++ b/plugins/Lv2Effect/CMakeLists.txt
@@ -1,7 +1,7 @@
 IF(LMMS_HAVE_LV2)
-	INCLUDE_DIRECTORIES(${LV2_INCLUDE_DIRS})
-	INCLUDE_DIRECTORIES(${LILV_INCLUDE_DIRS})
-	INCLUDE_DIRECTORIES(${SUIL_INCLUDE_DIRS})
+	include_directories(SYSTEM ${LV2_INCLUDE_DIRS})
+	include_directories(SYSTEM ${LILV_INCLUDE_DIRS})
+	include_directories(SYSTEM ${SUIL_INCLUDE_DIRS})
 	INCLUDE(BuildPlugin)
 	BUILD_PLUGIN(lv2effect Lv2Effect.cpp Lv2FxControls.cpp Lv2FxControlDialog.cpp Lv2Effect.h Lv2FxControls.h Lv2FxControlDialog.h
 		MOCFILES Lv2Effect.h Lv2FxControls.h Lv2FxControlDialog.h
--- a/plugins/Lv2Instrument/CMakeLists.txt
+++ b/plugins/Lv2Instrument/CMakeLists.txt
@@ -1,7 +1,7 @@
 IF(LMMS_HAVE_LV2)
-	INCLUDE_DIRECTORIES(${LV2_INCLUDE_DIRS})
-	INCLUDE_DIRECTORIES(${LILV_INCLUDE_DIRS})
-	INCLUDE_DIRECTORIES(${SUIL_INCLUDE_DIRS})
+	include_directories(SYSTEM ${LV2_INCLUDE_DIRS})
+	include_directories(SYSTEM ${LILV_INCLUDE_DIRS})
+	include_directories(SYSTEM ${SUIL_INCLUDE_DIRS})
 	INCLUDE(BuildPlugin)
 	BUILD_PLUGIN(lv2instrument Lv2Instrument.cpp Lv2Instrument.h MOCFILES Lv2Instrument.h EMBEDDED_RESOURCES logo.png)
 ENDIF(LMMS_HAVE_LV2)
--- a/plugins/OpulenZ/CMakeLists.txt
+++ b/plugins/OpulenZ/CMakeLists.txt
@@ -1,20 +1,16 @@
-INCLUDE(BuildPlugin)
+include(BuildPlugin)

-# Avoid unused warnings for mididata.h
-IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
-ENDIF()
+add_library(adplug STATIC
+	adplug/src/fmopl.c
+	adplug/src/temuopl.cpp
+)
+target_include_directories(adplug PUBLIC adplug/src)
+set_target_properties(adplug PROPERTIES SYSTEM TRUE)

-INCLUDE_DIRECTORIES(adplug/src)
-
-BUILD_PLUGIN(opulenz
+build_plugin(opulenz
 	OpulenZ.cpp
 	OpulenZ.h
-	adplug/src/opl.h
-	adplug/src/fmopl.c
-	adplug/src/fmopl.h
-	adplug/src/temuopl.cpp
-	adplug/src/temuopl.h
 	MOCFILES OpulenZ.h
 	EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png"
 )
+target_link_libraries(opulenz adplug)
--- a/plugins/OpulenZ/OpulenZ.cpp
+++ b/plugins/OpulenZ/OpulenZ.cpp
@@ -46,9 +46,9 @@
 #include <cassert>
 #include <cmath>

-#include "opl.h"
-#include "temuopl.h"
-#include "mididata.h"
+#include <opl.h>
+#include <temuopl.h>
+#include <mididata.h>

 #include "embed.h"
 #include "debug.h"
--- a/plugins/Sid/SidInstrument.cpp
+++ b/plugins/Sid/SidInstrument.cpp
@@ -29,7 +29,7 @@
 #include <cmath>
 #include <cstdio>

-#include "sid.h"
+#include <sid.h>

 #include "SidInstrument.h"
 #include "AudioEngine.h"
--- a/plugins/Sid/resid/CMakeLists.txt
+++ b/plugins/Sid/resid/CMakeLists.txt
@@ -1,3 +1,5 @@
+set_directory_properties(PROPERTIES SYSTEM TRUE)
+
 # These are the defaults
 set(RESID_INLINING 1)
 set(RESID_INLINE inline)
--- a/plugins/SlicerT/CMakeLists.txt
+++ b/plugins/SlicerT/CMakeLists.txt
@@ -1,10 +1,16 @@
-INCLUDE(BuildPlugin)
+include(BuildPlugin)

-INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS})
-LINK_LIBRARIES(${FFTW3F_LIBRARIES})
+include_directories(SYSTEM ${FFTW3F_INCLUDE_DIRS})
+link_libraries(${FFTW3F_LIBRARIES})

-INCLUDE_DIRECTORIES(${SAMPLERATE_INCLUDE_DIRS})
-LINK_DIRECTORIES(${SAMPLERATE_LIBRARY_DIRS})
-LINK_LIBRARIES(${SAMPLERATE_LIBRARIES})
-
-BUILD_PLUGIN(slicert SlicerT.cpp SlicerT.h SlicerTView.cpp SlicerTView.h SlicerTWaveform.cpp SlicerTWaveform.h MOCFILES SlicerT.h SlicerTView.h SlicerTWaveform.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
+build_plugin(slicert
+	SlicerT.cpp
+	SlicerT.h
+	SlicerTView.cpp
+	SlicerTView.h
+	SlicerTWaveform.cpp
+	SlicerTWaveform.h
+	MOCFILES SlicerT.h SlicerTView.h SlicerTWaveform.h
+	EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png"
+)
+target_link_libraries(slicert SampleRate::samplerate)
--- a/plugins/SpectrumAnalyzer/CMakeLists.txt
+++ b/plugins/SpectrumAnalyzer/CMakeLists.txt
@@ -1,5 +1,5 @@
 INCLUDE(BuildPlugin)
-INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS})
+include_directories(SYSTEM ${FFTW3F_INCLUDE_DIRS})

 LINK_LIBRARIES(${FFTW3F_LIBRARIES})

--- a/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt
+++ b/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt
@@ -76,7 +76,7 @@ if(IS_MINGW)
 	" HAS_STD_MUTEX)

 	if(NOT HAS_STD_MUTEX)
-		target_include_directories(${EXE_NAME} PRIVATE
+		target_include_directories(${EXE_NAME} SYSTEM PRIVATE
 			"${LMMS_SOURCE_DIR}/src/3rdparty/mingw-std-threads")
 		target_compile_definitions(${EXE_NAME} PRIVATE
 			-DUSE_MINGW_THREADS_REPLACEMENT)
--- a/plugins/VstBase/VstPlugin.cpp
+++ b/plugins/VstBase/VstPlugin.cpp
@@ -36,7 +36,7 @@

 #ifdef LMMS_BUILD_LINUX
 #	include <QX11Info>
-#	include "X11EmbedContainer.h"
+#	include <X11EmbedContainer.h>
 #endif

 #include <QWindow>
--- a/plugins/Xpressive/CMakeLists.txt
+++ b/plugins/Xpressive/CMakeLists.txt
@@ -1,6 +1,5 @@
 INCLUDE(BuildPlugin)

-INCLUDE_DIRECTORIES(exprtk)
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_sc_andor")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_return_statement")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_break_continue")
@@ -8,7 +7,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_comments")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_string_capabilities")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_io_file")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dexprtk_disable_rtl_vecops")
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WERROR_FLAGS} -fexceptions")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")

 IF(LMMS_BUILD_WIN32 AND NOT MSVC)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj -Dexprtk_disable_enhanced_features")
@@ -16,13 +15,16 @@ ELSEIF(LMMS_BUILD_WIN32 AND MSVC)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
 ENDIF()

-BUILD_PLUGIN(xpressive
+add_library(exprtk INTERFACE)
+target_include_directories(exprtk INTERFACE exprtk)
+set_target_properties(exprtk PROPERTIES SYSTEM TRUE)
+
+build_plugin(xpressive
 	Xpressive.cpp
 	ExprSynth.cpp
 	Xpressive.h
-	exprtk/exprtk.hpp
+	ExprSynth.h
 	MOCFILES Xpressive.h
 	EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png"
 )
-
-
+target_link_libraries(xpressive exprtk)
--- a/plugins/Xpressive/ExprSynth.cpp
+++ b/plugins/Xpressive/ExprSynth.cpp
@@ -36,7 +36,7 @@
 #include "NotePlayHandle.h"


-#include "exprtk.hpp"
+#include <exprtk.hpp>

 #define WARN_EXPRTK qWarning("ExprTk exception")

@@ -820,4 +820,4 @@ void ExprSynth::renderOutput(fpp_t frames, sampleFrame *buf)
 }


-} // namespace lmms
+} // namespace lmms
--- a/plugins/ZynAddSubFx/CMakeLists.txt
+++ b/plugins/ZynAddSubFx/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 # definitions for ZynAddSubFX
 IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD OR LMMS_BUILD_FREEBSD)
 	FIND_PACKAGE(X11)
-	INCLUDE_DIRECTORIES(${X11_INCLUDE_DIR})
+	include_directories(SYSTEM ${X11_INCLUDE_DIR})
 	ADD_DEFINITIONS(-DOS_LINUX)
 ELSE()
 	ADD_DEFINITIONS(-DOS_WINDOWS)
@@ -44,21 +44,21 @@ IF(NOT EXISTS ${FLTK_FLUID_EXECUTABLE})
    ENDIF()
 ENDIF()

-include_directories(
+include_directories(SYSTEM
 	"${FLTK_INCLUDE_DIR}"
-	"${CMAKE_CURRENT_SOURCE_DIR}"
 	${FFTW3F_INCLUDE_DIRS}
+)
+include_directories(
+	"${CMAKE_CURRENT_SOURCE_DIR}"
 	"${CMAKE_CURRENT_BINARY_DIR}"
 	"${CMAKE_BINARY_DIR}"
-	"${CMAKE_SOURCE_DIR}/src/3rdparty/mingw-std-threads"
-	"${CMAKE_CURRENT_SOURCE_DIR}/zynaddsubfx/src/UI"
 )

 ADD_DEFINITIONS(-DPLUGINVERSION)	# removes exit confirmation dialogs etc. in MasterUI.fl
 add_subdirectory(zynaddsubfx/src/Nio)
 add_subdirectory(zynaddsubfx/src/UI)

-SET(zynaddsubfx_core_SRCS
+add_library(zynaddsubfx_synth OBJECT
    zynaddsubfx/src/DSP/AnalogFilter.cpp
    zynaddsubfx/src/DSP/FFTwrapper.cpp
    zynaddsubfx/src/DSP/Filter.cpp
@@ -107,13 +107,32 @@ SET(zynaddsubfx_core_SRCS
 	zynaddsubfx/src/Synth/SUBnote.cpp
 )

-add_library(ZynAddSubFxCoreObjs OBJECT LocalZynAddSubFx.cpp ${zynaddsubfx_core_SRCS})
-add_library(ZynAddSubFxCore INTERFACE)
-target_sources(ZynAddSubFxCore INTERFACE
-	$<TARGET_OBJECTS:ZynAddSubFxCoreObjs>
-	$<TARGET_OBJECTS:zynaddsubfx_nio>
-)
+set_target_properties(zynaddsubfx_nio PROPERTIES SYSTEM TRUE)
+set_target_properties(zynaddsubfx_gui PROPERTIES SYSTEM TRUE)
+set_target_properties(zynaddsubfx_synth PROPERTIES SYSTEM TRUE)

+if(MINGW)
+	target_link_libraries(zynaddsubfx_nio PUBLIC mingw_stdthreads)
+	target_link_libraries(zynaddsubfx_gui PUBLIC mingw_stdthreads)
+	target_link_libraries(zynaddsubfx_synth PUBLIC mingw_stdthreads)
+endif()
+
+# Relative include paths don't work automatically for the GUI, because the
+# generated C++ files aren't in the source directory. Thus, add the expected
+# source directory as an additional include directory.
+target_include_directories(zynaddsubfx_gui PUBLIC zynaddsubfx/src/UI)
+
+add_library(ZynAddSubFxCore STATIC
+	LocalZynAddSubFx.cpp
+)
+target_include_directories(ZynAddSubFxCore SYSTEM PUBLIC
+	zynaddsubfx/src
+	"${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx/src"
+)
+target_static_libraries(ZynAddSubFxCore PUBLIC
+	zynaddsubfx_nio
+	zynaddsubfx_synth
+)
 target_link_libraries(ZynAddSubFxCore INTERFACE
 	${FFTW3F_LIBRARIES}
 	${QT_LIBRARIES}
@@ -132,7 +151,7 @@ ELSE()
 	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 ENDIF()
 BUILD_PLUGIN(zynaddsubfx ZynAddSubFx.cpp ZynAddSubFx.h MOCFILES ZynAddSubFx.h EMBEDDED_RESOURCES artwork.png logo.png)
-target_link_libraries(zynaddsubfx ZynAddSubFxCore)
+target_static_libraries(zynaddsubfx ZynAddSubFxCore)

 if(MSVC)
 	set(WINRC "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx.rc")
@@ -155,8 +174,8 @@ add_executable(RemoteZynAddSubFx
 	RemoteZynAddSubFx.cpp
 	${LMMS_COMMON_SRCS}
 	"${WINRC}"
-	$<TARGET_OBJECTS:zynaddsubfx_gui>
 )
+target_static_libraries(RemoteZynAddSubFx ZynAddSubFxCore zynaddsubfx_gui)
 INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}")
 # Needed to deploy dependencies of RemoteZynAddSubFx
 SET_PROPERTY(GLOBAL APPEND PROPERTY PLUGINS_BUILT "RemoteZynAddSubFx")
@@ -176,7 +195,7 @@ IF(FLTK_CONFIG AND NOT (LMMS_BUILD_APPLE OR LMMS_BUILD_WIN32))
 	STRING(REPLACE " " ";" FLTK_FILTERED_LDFLAGS ${FLTK_FILTERED_LDFLAGS})
 	LIST(REMOVE_ITEM FLTK_FILTERED_LDFLAGS -lX11)
 ENDIF()
-target_link_libraries(RemoteZynAddSubFx ZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS})
+target_link_libraries(RemoteZynAddSubFx ${FLTK_FILTERED_LDFLAGS})

 if(LMMS_HAVE_LIBRT)
 	target_link_libraries(RemoteZynAddSubFx rt)
--- a/plugins/ZynAddSubFx/LocalZynAddSubFx.cpp
+++ b/plugins/ZynAddSubFx/LocalZynAddSubFx.cpp
@@ -37,10 +37,10 @@

 #include "MidiEvent.h"

-#include "zynaddsubfx/src/Nio/NulEngine.h"
-#include "zynaddsubfx/src/Misc/Master.h"
-#include "zynaddsubfx/src/Misc/Part.h"
-#include "zynaddsubfx/src/Misc/Util.h"
+#include <Nio/NulEngine.h>
+#include <Misc/Master.h>
+#include <Misc/Part.h>
+#include <Misc/Util.h>

 // Global variable in zynaddsubfx/src/globals.h
 SYNTH_T* synth = nullptr;
--- a/plugins/ZynAddSubFx/RemoteZynAddSubFx.cpp
+++ b/plugins/ZynAddSubFx/RemoteZynAddSubFx.cpp
@@ -37,8 +37,8 @@
 #include "RemotePluginClient.h"
 #include "LocalZynAddSubFx.h"

-#include "zynaddsubfx/src/Nio/Nio.h"
-#include "zynaddsubfx/src/UI/MasterUI.h"
+#include <Nio/Nio.h>
+#include <UI/MasterUI.h>

 using namespace lmms;

--- a/plugins/ZynAddSubFx/ZynAddSubFx.h
+++ b/plugins/ZynAddSubFx/ZynAddSubFx.h
@@ -28,12 +28,12 @@
 #include <QMap>
 #include <QMutex>

+#include <globals.h>
+
 #include "AutomatableModel.h"
 #include "Instrument.h"
 #include "InstrumentView.h"
 #include "RemotePlugin.h"
-#include "zynaddsubfx/src/globals.h"
-

 class QPushButton;