From 8102192d64da58ebb597215176ae18c9823233b2 Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Wed, 22 May 2024 21:17:23 +0530 Subject: [PATCH 01/13] deleted the confusing compiler flag (might not be necessary) --- plugins/LadspaEffect/caps/CMakeLists.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/plugins/LadspaEffect/caps/CMakeLists.txt b/plugins/LadspaEffect/caps/CMakeLists.txt index f82fa5ab083..ea2c1b7e9f6 100644 --- a/plugins/LadspaEffect/caps/CMakeLists.txt +++ b/plugins/LadspaEffect/caps/CMakeLists.txt @@ -27,12 +27,3 @@ IF(LMMS_BUILD_WIN32) COMMAND_EXPAND_LISTS ) ENDIF(LMMS_BUILD_WIN32) - -IF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD) - SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined") -ENDIF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD) - -IF(LMMS_BUILD_LINUX) - SET_TARGET_PROPERTIES(caps PROPERTIES LINK_FLAGS "${LINK_FLAGS}") -ENDIF(LMMS_BUILD_LINUX) - From 3285822f49455718a304cf2bdf5ae1c1388ceac7 Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Wed, 22 May 2024 21:22:03 +0530 Subject: [PATCH 02/13] convert COMPILE_FLAGS variable to list in swh/CMakeList --- plugins/LadspaEffect/swh/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index b76c959310b..4d8ca9a05fe 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -5,16 +5,17 @@ FILE(WRITE ladspa/config.h "") IF(LMMS_BUILD_WIN32) SET(PIC_FLAGS "") ELSE() - SET(PIC_FLAGS "-fPIC -DPIC") + SET(PIC_FLAGS "-fPIC" "-DPIC") ENDIF() # Additional compile flags if(MSVC) - set(COMPILE_FLAGS "${COMPILE_FLAGS} /wd4244 /wd4273 /wd4305") + set(COMPILE_FLAGS ${COMPILE_FLAGS} "/wd4244" "/wd4273" "/wd4305") else() - set(COMPILE_FLAGS "${COMPILE_FLAGS} -O3 -Wall") - set(COMPILE_FLAGS "${COMPILE_FLAGS} -fomit-frame-pointer -funroll-loops -ffast-math -c -fno-strict-aliasing") - set(COMPILE_FLAGS "${COMPILE_FLAGS} ${PIC_FLAGS}") + set(COMPILE_FLAGS ${COMPILE_FLAGS} "-O3" "-Wall" "-c" + "-fomit-frame-pointer" "-funroll-loops" "-ffast-math" "-fno-strict-aliasing" + "${PIC_FLAGS}" + ) endif() # Loop over every XML file From ad3a21b65cd8ab2f90b89fba89ad7b03804b229e Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Wed, 22 May 2024 21:27:39 +0530 Subject: [PATCH 03/13] switched to target_compile_options within swh/cmakelists --- plugins/LadspaEffect/swh/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index 4d8ca9a05fe..e1950d0b673 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -62,7 +62,7 @@ FOREACH(_item ${XML_SOURCES}) endif(LMMS_BUILD_WIN32) SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES PREFIX "") - SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS}") + TARGET_COMPILE_OPTIONS("{_plugin}" PUBLIC "${COMPILE_FLAGS}") SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS}") INSTALL(TARGETS "${_plugin}" LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") ENDFOREACH() @@ -76,7 +76,7 @@ INCLUDE_DIRECTORIES( ) ADD_LIBRARY(iir STATIC ladspa/util/iir.c) -SET_TARGET_PROPERTIES(iir PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}") +TARGET_COMPILE_OPTIONS(iir PUBLIC "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(bandpass_a_iir_1893 iir) TARGET_LINK_LIBRARIES(bandpass_iir_1892 iir) TARGET_LINK_LIBRARIES(butterworth_1902 iir) @@ -87,23 +87,23 @@ TARGET_LINK_LIBRARIES(notch_iir_1894 iir) FILE(GLOB GSM_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ladspa/gsm/*.c") LIST(SORT GSM_SOURCES) ADD_LIBRARY(gsm STATIC ${GSM_SOURCES}) -SET_TARGET_PROPERTIES(gsm PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}") +TARGET_COMPILE_OPTIONS(gsm PUBLIC "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(gsm_1215 gsm) ADD_LIBRARY(gverb STATIC ladspa/gverb/gverb.c ladspa/gverb/gverbdsp.c) -SET_TARGET_PROPERTIES(gverb PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}") +TARGET_COMPILE_OPTIONS(gverb PUBLIC "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(gverb_1216 gverb) ADD_LIBRARY(blo STATIC ladspa/util/blo.c) -SET_TARGET_PROPERTIES(blo PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}") +TARGET_COMPILE_OPTIONS(blo PUBLIC "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(analogue_osc_1416 blo) TARGET_LINK_LIBRARIES(fm_osc_1415 blo) TARGET_LINK_LIBRARIES(hermes_filter_1200 blo) ADD_LIBRARY(rms STATIC ladspa/util/rms.c) ADD_LIBRARY(db STATIC ladspa/util/db.c) -SET_TARGET_PROPERTIES(rms PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}") -SET_TARGET_PROPERTIES(db PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}") +TARGET_COMPILE_OPTIONS(rms PUBLIC "${PIC_FLAGS}") +TARGET_COMPILE_OPTIONS(db PUBLIC "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(sc1_1425 rms db) TARGET_LINK_LIBRARIES(sc2_1426 rms db) TARGET_LINK_LIBRARIES(sc3_1427 rms db) @@ -112,7 +112,7 @@ TARGET_LINK_LIBRARIES(sc4m_1916 rms db) TARGET_LINK_LIBRARIES(se4_1883 rms db) ADD_LIBRARY(pitchscale STATIC ladspa/util/pitchscale.c) -SET_TARGET_PROPERTIES(pitchscale PROPERTIES COMPILE_FLAGS "${PIC_FLAGS}") +TARGET_COMPILE_OPTIONS(pitchscale PUBLIC "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(pitchscale -lfftw3f) TARGET_LINK_LIBRARIES(pitch_scale_1193 pitchscale) TARGET_LINK_LIBRARIES(pitch_scale_1194 pitchscale) From fb7831d56bfbadd80e7518d5351661760297a742 Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Wed, 22 May 2024 21:40:04 +0530 Subject: [PATCH 04/13] use target_link_options --- cmake/modules/BuildPlugin.cmake | 2 +- plugins/VstBase/RemoteVstPlugin/CMakeLists.txt | 5 +---- plugins/ZynAddSubFx/CMakeLists.txt | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake index aaccd3c4b34..d75707bdd5f 100644 --- a/cmake/modules/BuildPlugin.cmake +++ b/cmake/modules/BuildPlugin.cmake @@ -60,7 +60,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME) IF(LMMS_BUILD_APPLE) IF ("${PLUGIN_LINK}" STREQUAL "SHARED") - SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") + TARGET_LINK_OPTIONS(${PLUGIN_NAME} PUBLIC "-undefined dynamic_lookup") ENDIF() ENDIF(LMMS_BUILD_APPLE) IF(LMMS_BUILD_WIN32) diff --git a/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt b/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt index c75b95ab780..e51c0b3fe9d 100644 --- a/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt +++ b/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt @@ -61,10 +61,7 @@ target_compile_definitions(${EXE_NAME} PRIVATE BUILD_REMOTE_PLUGIN_CLIENT) # Workaround for missing WinMain if(MSVC) - set_property(TARGET ${EXE_NAME} - APPEND - PROPERTY LINK_FLAGS "/entry:mainCRTStartup" -) + target_link_options(${EXE_NAME} INTERFACE "/entry:mainCRTStartup") endif() if(IS_MINGW) diff --git a/plugins/ZynAddSubFx/CMakeLists.txt b/plugins/ZynAddSubFx/CMakeLists.txt index 35dc08c4dbc..53d44457275 100644 --- a/plugins/ZynAddSubFx/CMakeLists.txt +++ b/plugins/ZynAddSubFx/CMakeLists.txt @@ -164,8 +164,8 @@ SET_PROPERTY(GLOBAL APPEND PROPERTY PLUGINS_BUILT "RemoteZynAddSubFx") TARGET_COMPILE_DEFINITIONS(RemoteZynAddSubFx PRIVATE BUILD_REMOTE_PLUGIN_CLIENT) IF(LMMS_BUILD_WIN32) - SET_TARGET_PROPERTIES(RemoteZynAddSubFx PROPERTIES LINK_FLAGS "${LINK_FLAGS} -mwindows") -ENDIF(LMMS_BUILD_WIN32) + target_link_options(RemoteZynAddSubFx PUBLIC "-mwindows") +ENDIF() # Remove useless dependencies from FLTK. Use fltk-config to avoid static library # in older environments From 9dde122eb428a9a336a49a78f4cdbff77b467472 Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Wed, 22 May 2024 21:44:43 +0530 Subject: [PATCH 05/13] missed the $ --- plugins/LadspaEffect/swh/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index e1950d0b673..b2ee9d85c47 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -62,7 +62,7 @@ FOREACH(_item ${XML_SOURCES}) endif(LMMS_BUILD_WIN32) SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES PREFIX "") - TARGET_COMPILE_OPTIONS("{_plugin}" PUBLIC "${COMPILE_FLAGS}") + TARGET_COMPILE_OPTIONS("${_plugin}" PUBLIC "${COMPILE_FLAGS}") SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS}") INSTALL(TARGETS "${_plugin}" LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") ENDFOREACH() From e20ed2111a4e0041abce47308ee825142152fddb Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Wed, 22 May 2024 21:51:44 +0530 Subject: [PATCH 06/13] gig player --- plugins/GigPlayer/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/GigPlayer/CMakeLists.txt b/plugins/GigPlayer/CMakeLists.txt index 6ec8fe1692c..084929841a1 100644 --- a/plugins/GigPlayer/CMakeLists.txt +++ b/plugins/GigPlayer/CMakeLists.txt @@ -4,13 +4,11 @@ if(LMMS_HAVE_GIG) SET(CMAKE_AUTOUIC ON) # Required for not crashing loading files with libgig - SET(GCC_COVERAGE_COMPILE_FLAGS "-fexceptions") - add_definitions(${GCC_COVERAGE_COMPILE_FLAGS}) + add_compile_options("-fexceptions") # disable deprecated check for mingw-x-libgig if(LMMS_BUILD_WIN32) - SET(GCC_GIG_COMPILE_FLAGS "-Wno-deprecated") - add_definitions(${GCC_GIG_COMPILE_FLAGS}) + add_compile_options()("-Wno-deprecated") endif(LMMS_BUILD_WIN32) link_directories(${GIG_LIBRARY_DIRS}) From 262ad54fc8917dc9e468e8e27f3459daa2a029a6 Mon Sep 17 00:00:00 2001 From: Rossmaxx <74815851+Rossmaxx@users.noreply.github.com> Date: Wed, 22 May 2024 21:58:44 +0530 Subject: [PATCH 07/13] Parens mistake --- plugins/GigPlayer/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/GigPlayer/CMakeLists.txt b/plugins/GigPlayer/CMakeLists.txt index 084929841a1..92c80fedceb 100644 --- a/plugins/GigPlayer/CMakeLists.txt +++ b/plugins/GigPlayer/CMakeLists.txt @@ -8,7 +8,7 @@ if(LMMS_HAVE_GIG) # disable deprecated check for mingw-x-libgig if(LMMS_BUILD_WIN32) - add_compile_options()("-Wno-deprecated") + add_compile_options("-Wno-deprecated") endif(LMMS_BUILD_WIN32) link_directories(${GIG_LIBRARY_DIRS}) From 68b9962e4c47c0461764bf61c090dbf0d2eaaa14 Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Thu, 23 May 2024 11:01:25 +0530 Subject: [PATCH 08/13] remove quotes from swh/cmakelists --- plugins/LadspaEffect/swh/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index b2ee9d85c47..12cd2a0da98 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -5,16 +5,16 @@ FILE(WRITE ladspa/config.h "") IF(LMMS_BUILD_WIN32) SET(PIC_FLAGS "") ELSE() - SET(PIC_FLAGS "-fPIC" "-DPIC") + SET(PIC_FLAGS -fPIC -DPIC) ENDIF() # Additional compile flags if(MSVC) - set(COMPILE_FLAGS ${COMPILE_FLAGS} "/wd4244" "/wd4273" "/wd4305") + set(COMPILE_FLAGS ${COMPILE_FLAGS} /wd4244 /wd4273 /wd4305) else() - set(COMPILE_FLAGS ${COMPILE_FLAGS} "-O3" "-Wall" "-c" - "-fomit-frame-pointer" "-funroll-loops" "-ffast-math" "-fno-strict-aliasing" - "${PIC_FLAGS}" + set(COMPILE_FLAGS ${COMPILE_FLAGS} -O3 -Wall -c + -fomit-frame-pointer -funroll-loops -ffast-math -fno-strict-aliasing + ${PIC_FLAGS} ) endif() From 97f753339b1f85ca9c02954b96cce13652d141af Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Thu, 23 May 2024 11:06:58 +0530 Subject: [PATCH 09/13] switched to private here --- plugins/VstBase/RemoteVstPlugin/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt b/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt index e51c0b3fe9d..5bcf9f065da 100644 --- a/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt +++ b/plugins/VstBase/RemoteVstPlugin/CMakeLists.txt @@ -61,7 +61,7 @@ target_compile_definitions(${EXE_NAME} PRIVATE BUILD_REMOTE_PLUGIN_CLIENT) # Workaround for missing WinMain if(MSVC) - target_link_options(${EXE_NAME} INTERFACE "/entry:mainCRTStartup") + target_link_options(${EXE_NAME} PRIVATE "/entry:mainCRTStartup") endif() if(IS_MINGW) From cab60d82ab42023044f80a96d3e25bf361309d15 Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Thu, 23 May 2024 11:09:54 +0530 Subject: [PATCH 10/13] set target_link_options in swh/cmakelists --- plugins/LadspaEffect/swh/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index 5f87ba42f58..8c8e12110ca 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -63,7 +63,7 @@ FOREACH(_item ${XML_SOURCES}) SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES PREFIX "") TARGET_COMPILE_OPTIONS("${_plugin}" PUBLIC "${COMPILE_FLAGS}") - SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS}") + TARGET_LINK_OPTIONS("${_plugin}" PUBLIC "${LINK_FLAGS}") INSTALL(TARGETS "${_plugin}" LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") ENDFOREACH() From b4346c97548e438084b174e9d7b57d89721eadac Mon Sep 17 00:00:00 2001 From: Rossmaxx <74815851+Rossmaxx@users.noreply.github.com> Date: Thu, 23 May 2024 14:38:29 +0530 Subject: [PATCH 11/13] Removed quotes in BuildPlugin.cmake --- cmake/modules/BuildPlugin.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake index d75707bdd5f..5fcb300249b 100644 --- a/cmake/modules/BuildPlugin.cmake +++ b/cmake/modules/BuildPlugin.cmake @@ -60,7 +60,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME) IF(LMMS_BUILD_APPLE) IF ("${PLUGIN_LINK}" STREQUAL "SHARED") - TARGET_LINK_OPTIONS(${PLUGIN_NAME} PUBLIC "-undefined dynamic_lookup") + TARGET_LINK_OPTIONS(${PLUGIN_NAME} PUBLIC -undefined dynamic_lookup) ENDIF() ENDIF(LMMS_BUILD_APPLE) IF(LMMS_BUILD_WIN32) From f36f02fb29746bceb133cc1cf8580852690a6183 Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Fri, 24 May 2024 17:39:56 +0530 Subject: [PATCH 12/13] lowercase + private --- cmake/modules/BuildPlugin.cmake | 2 +- plugins/LadspaEffect/swh/CMakeLists.txt | 17 ++++++++--------- plugins/ZynAddSubFx/CMakeLists.txt | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake index 5fcb300249b..69af41ecb12 100644 --- a/cmake/modules/BuildPlugin.cmake +++ b/cmake/modules/BuildPlugin.cmake @@ -60,7 +60,7 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME) IF(LMMS_BUILD_APPLE) IF ("${PLUGIN_LINK}" STREQUAL "SHARED") - TARGET_LINK_OPTIONS(${PLUGIN_NAME} PUBLIC -undefined dynamic_lookup) + TARGET_LINK_OPTIONS(${PLUGIN_NAME} PRIVATE -undefined dynamic_lookup) ENDIF() ENDIF(LMMS_BUILD_APPLE) IF(LMMS_BUILD_WIN32) diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt index 8c8e12110ca..c71572bd2e0 100644 --- a/plugins/LadspaEffect/swh/CMakeLists.txt +++ b/plugins/LadspaEffect/swh/CMakeLists.txt @@ -62,8 +62,7 @@ FOREACH(_item ${XML_SOURCES}) endif(LMMS_BUILD_WIN32) SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES PREFIX "") - TARGET_COMPILE_OPTIONS("${_plugin}" PUBLIC "${COMPILE_FLAGS}") - TARGET_LINK_OPTIONS("${_plugin}" PUBLIC "${LINK_FLAGS}") + target_compile_options("${_plugin}" PRIVATE "${COMPILE_FLAGS}") INSTALL(TARGETS "${_plugin}" LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa") ENDFOREACH() @@ -76,7 +75,7 @@ INCLUDE_DIRECTORIES( ) ADD_LIBRARY(iir STATIC ladspa/util/iir.c) -TARGET_COMPILE_OPTIONS(iir PUBLIC "${PIC_FLAGS}") +target_compile_options(iir PRIVATE "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(bandpass_a_iir_1893 iir) TARGET_LINK_LIBRARIES(bandpass_iir_1892 iir) TARGET_LINK_LIBRARIES(butterworth_1902 iir) @@ -87,23 +86,23 @@ TARGET_LINK_LIBRARIES(notch_iir_1894 iir) FILE(GLOB GSM_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ladspa/gsm/*.c") LIST(SORT GSM_SOURCES) ADD_LIBRARY(gsm STATIC ${GSM_SOURCES}) -TARGET_COMPILE_OPTIONS(gsm PUBLIC "${PIC_FLAGS}") +target_compile_options(gsm PRIVATE "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(gsm_1215 gsm) ADD_LIBRARY(gverb STATIC ladspa/gverb/gverb.c ladspa/gverb/gverbdsp.c) -TARGET_COMPILE_OPTIONS(gverb PUBLIC "${PIC_FLAGS}") +target_compile_options(gverb PRIVATE "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(gverb_1216 gverb) ADD_LIBRARY(blo STATIC ladspa/util/blo.c) -TARGET_COMPILE_OPTIONS(blo PUBLIC "${PIC_FLAGS}") +target_compile_options(blo PRIVATE "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(analogue_osc_1416 blo) TARGET_LINK_LIBRARIES(fm_osc_1415 blo) TARGET_LINK_LIBRARIES(hermes_filter_1200 blo) ADD_LIBRARY(rms STATIC ladspa/util/rms.c) ADD_LIBRARY(db STATIC ladspa/util/db.c) -TARGET_COMPILE_OPTIONS(rms PUBLIC "${PIC_FLAGS}") -TARGET_COMPILE_OPTIONS(db PUBLIC "${PIC_FLAGS}") +target_compile_options(rms PRIVATE "${PIC_FLAGS}") +target_compile_options(db PRIVATE "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(sc1_1425 rms db) TARGET_LINK_LIBRARIES(sc2_1426 rms db) TARGET_LINK_LIBRARIES(sc3_1427 rms db) @@ -112,7 +111,7 @@ TARGET_LINK_LIBRARIES(sc4m_1916 rms db) TARGET_LINK_LIBRARIES(se4_1883 rms db) ADD_LIBRARY(pitchscale STATIC ladspa/util/pitchscale.c) -TARGET_COMPILE_OPTIONS(pitchscale PUBLIC "${PIC_FLAGS}") +target_compile_options(pitchscale PRIVATE "${PIC_FLAGS}") TARGET_LINK_LIBRARIES(pitchscale ${FFTW3F_LIBRARIES}) TARGET_LINK_LIBRARIES(pitch_scale_1193 pitchscale) TARGET_LINK_LIBRARIES(pitch_scale_1194 pitchscale) diff --git a/plugins/ZynAddSubFx/CMakeLists.txt b/plugins/ZynAddSubFx/CMakeLists.txt index 53d44457275..0f6af20eec0 100644 --- a/plugins/ZynAddSubFx/CMakeLists.txt +++ b/plugins/ZynAddSubFx/CMakeLists.txt @@ -164,7 +164,7 @@ SET_PROPERTY(GLOBAL APPEND PROPERTY PLUGINS_BUILT "RemoteZynAddSubFx") TARGET_COMPILE_DEFINITIONS(RemoteZynAddSubFx PRIVATE BUILD_REMOTE_PLUGIN_CLIENT) IF(LMMS_BUILD_WIN32) - target_link_options(RemoteZynAddSubFx PUBLIC "-mwindows") + target_link_options(RemoteZynAddSubFx PRIVATE "-mwindows") ENDIF() # Remove useless dependencies from FLTK. Use fltk-config to avoid static library From 1380122804b36c363007c5db1abfb5e0e8617f45 Mon Sep 17 00:00:00 2001 From: Rossmaxx Date: Fri, 24 May 2024 17:44:21 +0530 Subject: [PATCH 13/13] bump cmake --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1da10775ba7..fbd9cdfcf1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) +CMAKE_MINIMUM_REQUIRED(VERSION 3.13) # Set the given policy to NEW. If it does not exist, it will not be set. If it # is already set to NEW (most likely due to predating the minimum required CMake