From 3a9accba4b6bed660d4f5532f066f7bb0b52896d Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Mon, 14 Dec 2020 08:20:01 +0100 Subject: [PATCH] Put dependency libraries in namespaces --- benchmarks/CMakeLists.txt | 33 +++++++++---------- clients/CMakeLists.txt | 9 +++--- cmake/SfizzConfig.cmake | 47 ++++++++++++++++------------ demos/CMakeLists.txt | 10 +++--- devtools/CMakeLists.txt | 4 +-- editor/CMakeLists.txt | 2 +- editor/cmake/Vstgui.cmake | 34 ++++++++++---------- lv2/CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 +-- src/external/cpuid/CMakeLists.txt | 9 +++--- src/external/kiss_fft/CMakeLists.txt | 7 +++-- tests/CMakeLists.txt | 2 +- vst/CMakeLists.txt | 4 +-- vst/cmake/Vst3.cmake | 2 +- 14 files changed, 91 insertions(+), 78 deletions(-) diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index ee39bea5..a72c9f6c 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -12,13 +12,14 @@ find_path(SAMPLERATE_INCLUDE_DIR "samplerate.h") message(STATUS "Checking samplerate library: ${SAMPLERATE_LIBRARY}") message(STATUS "Checking samplerate includes: ${SAMPLERATE_INCLUDE_DIR}") if(SAMPLERATE_LIBRARY AND SAMPLERATE_INCLUDE_DIR) - add_library(sfizz-samplerate INTERFACE) - target_include_directories(sfizz-samplerate INTERFACE "${SAMPLERATE_INCLUDE_DIR}") - target_link_libraries(sfizz-samplerate INTERFACE "${SAMPLERATE_LIBRARY}") + add_library(sfizz_samplerate INTERFACE) + add_library(sfizz::samplerate ALIAS sfizz_samplerate) + target_include_directories(sfizz_samplerate INTERFACE "${SAMPLERATE_INCLUDE_DIR}") + target_link_libraries(sfizz_samplerate INTERFACE "${SAMPLERATE_LIBRARY}") endif() add_library(bm_simd STATIC ${BENCHMARK_SIMD_SOURCES}) -target_link_libraries(bm_simd PRIVATE absl::span sfizz-cpuid) +target_link_libraries(bm_simd PRIVATE absl::span sfizz::cpuid) target_include_directories(bm_simd PRIVATE ../src/external) add_library(bm_ftz STATIC ../src/sfizz/ScopedFTZ.cpp) @@ -72,37 +73,37 @@ target_link_libraries(bm_smoothers PRIVATE sfizz::sfizz) sfizz_add_benchmark(bm_powerFollower BM_powerFollower.cpp) target_link_libraries(bm_powerFollower PRIVATE sfizz::sfizz) -if(TARGET sfizz-samplerate) +if(TARGET sfizz::samplerate) sfizz_add_benchmark(bm_resample BM_resample.cpp ${BENCHMARK_SIMD_SOURCES}) -target_link_libraries(bm_resample PRIVATE sfizz-samplerate sfizz-sndfile sfizz-cpuid) +target_link_libraries(bm_resample PRIVATE sfizz::samplerate sfizz::sndfile sfizz::cpuid) endif() sfizz_add_benchmark(bm_envelopes BM_envelopes.cpp) sfizz_add_benchmark(bm_wavfile BM_wavfile.cpp) -target_link_libraries(bm_wavfile PRIVATE sfizz-sndfile) +target_link_libraries(bm_wavfile PRIVATE sfizz::sndfile) sfizz_add_benchmark(bm_flacfile BM_flacfile.cpp) -target_link_libraries(bm_flacfile PRIVATE sfizz-sndfile) +target_link_libraries(bm_flacfile PRIVATE sfizz::sndfile) sfizz_add_benchmark(bm_audioReaders BM_audioReaders.cpp ../src/sfizz/AudioReader.cpp) -target_link_libraries(bm_audioReaders PRIVATE st_audiofile sfizz-sndfile) +target_link_libraries(bm_audioReaders PRIVATE st_audiofile sfizz::sndfile) sfizz_add_benchmark(bm_readChunk BM_readChunk.cpp) -target_link_libraries(bm_readChunk PRIVATE sfizz-sndfile) +target_link_libraries(bm_readChunk PRIVATE sfizz::sndfile) sfizz_add_benchmark(bm_readChunkFlac BM_readChunkFlac.cpp) -target_link_libraries(bm_readChunkFlac PRIVATE sfizz-sndfile) +target_link_libraries(bm_readChunkFlac PRIVATE sfizz::sndfile) sfizz_add_benchmark(bm_resampleChunk BM_resampleChunk.cpp) -target_link_libraries(bm_resampleChunk PRIVATE sfizz-sndfile) +target_link_libraries(bm_resampleChunk PRIVATE sfizz::sndfile) sfizz_add_benchmark(bm_interpolators BM_interpolators.cpp) sfizz_add_benchmark(bm_filterModulation BM_filterModulation.cpp ../src/sfizz/SfzFilter.cpp) -target_link_libraries(bm_filterModulation PRIVATE sfizz-sndfile) +target_link_libraries(bm_filterModulation PRIVATE sfizz::sndfile) sfizz_add_benchmark(bm_filterStereoMono BM_filterStereoMono.cpp ../src/sfizz/SfzFilter.cpp) -target_link_libraries(bm_filterStereoMono PRIVATE sfizz-sndfile) +target_link_libraries(bm_filterStereoMono PRIVATE sfizz::sndfile) sfizz_add_benchmark(bm_stringResonator BM_stringResonator.cpp ../src/sfizz/effects/impl/ResonantArray.cpp @@ -111,7 +112,7 @@ sfizz_add_benchmark(bm_stringResonator BM_stringResonator.cpp ../src/sfizz/effects/impl/ResonantString.cpp ../src/sfizz/effects/impl/ResonantStringSSE.cpp ../src/sfizz/effects/impl/ResonantStringAVX.cpp) -target_link_libraries(bm_stringResonator PRIVATE sfizz-sndfile) +target_link_libraries(bm_stringResonator PRIVATE sfizz::sndfile) add_custom_target(sfizz_benchmarks) add_dependencies(sfizz_benchmarks @@ -148,7 +149,7 @@ endif() if(SFIZZ_SYSTEM_PROCESSOR MATCHES "armv7l") sfizz_add_benchmark(bm_pan_arm BM_pan_arm.cpp ../src/sfizz/Panning.cpp) - target_link_libraries(bm_pan_arm PRIVATE sfizz-jsl) + target_link_libraries(bm_pan_arm PRIVATE sfizz::jsl) add_dependencies(sfizz_benchmarks bm_pan_arm) endif() diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt index d975c257..7b9e3453 100644 --- a/clients/CMakeLists.txt +++ b/clients/CMakeLists.txt @@ -14,14 +14,15 @@ if(SFIZZ_JACK) endif() if(SFIZZ_RENDER) - add_library(sfizz-fmidi STATIC + add_library(sfizz_fmidi STATIC "external/fmidi/sources/fmidi/fmidi.h" "external/fmidi/sources/fmidi/fmidi_mini.cpp") - target_include_directories(sfizz-fmidi PUBLIC "external/fmidi/sources") - target_compile_definitions(sfizz-fmidi PUBLIC "FMIDI_STATIC=1" "FMIDI_DISABLE_DESCRIBE_API=1") + add_library(sfizz::fmidi ALIAS sfizz_fmidi) + target_include_directories(sfizz_fmidi PUBLIC "external/fmidi/sources") + target_compile_definitions(sfizz_fmidi PUBLIC "FMIDI_STATIC=1" "FMIDI_DISABLE_DESCRIBE_API=1") add_executable(sfizz_render MidiHelpers.h sfizz_render.cpp) - target_link_libraries(sfizz_render PRIVATE sfizz::sfizz sfizz-fmidi sfizz-sndfile sfizz-cxxopts) + target_link_libraries(sfizz_render PRIVATE sfizz::sfizz sfizz::fmidi sfizz::sndfile sfizz::cxxopts) sfizz_enable_lto_if_needed(sfizz_render) install(TARGETS sfizz_render DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT "render" OPTIONAL) endif() diff --git a/cmake/SfizzConfig.cmake b/cmake/SfizzConfig.cmake index 6935b874..cfe1e559 100644 --- a/cmake/SfizzConfig.cmake +++ b/cmake/SfizzConfig.cmake @@ -1,5 +1,6 @@ include(CMakeDependentOption) include(CheckCXXCompilerFlag) +include(CheckLibraryExists) include(GNUWarnings) set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to be used") @@ -90,29 +91,32 @@ function(sfizz_enable_fast_math NAME) endfunction() # The jsl utility library for C++ -add_library(sfizz-jsl INTERFACE) -target_include_directories(sfizz-jsl INTERFACE "external/jsl/include") +add_library(sfizz_jsl INTERFACE) +add_library(sfizz::jsl ALIAS sfizz_jsl) +target_include_directories(sfizz_jsl INTERFACE "external/jsl/include") # The cxxopts library -add_library(sfizz-cxxopts INTERFACE) -target_include_directories(sfizz-cxxopts INTERFACE "external/cxxopts") +add_library(sfizz_cxxopts INTERFACE) +add_library(sfizz::cxxopts ALIAS sfizz_cxxopts) +target_include_directories(sfizz_cxxopts INTERFACE "external/cxxopts") # The sndfile library if(SFIZZ_USE_SNDFILE OR SFIZZ_DEMOS OR SFIZZ_BENCHMARKS OR SFIZZ_RENDER) - add_library(sfizz-sndfile INTERFACE) + add_library(sfizz_sndfile INTERFACE) + add_library(sfizz::sndfile ALIAS sfizz_sndfile) if(SFIZZ_USE_VCPKG OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC") find_package(SndFile CONFIG REQUIRED) find_path(SNDFILE_INCLUDE_DIR "sndfile.hh") - target_include_directories(sfizz-sndfile INTERFACE "${SNDFILE_INCLUDE_DIR}") - target_link_libraries(sfizz-sndfile INTERFACE SndFile::sndfile) + target_include_directories(sfizz_sndfile INTERFACE "${SNDFILE_INCLUDE_DIR}") + target_link_libraries(sfizz_sndfile INTERFACE SndFile::sndfile) else() find_package(PkgConfig REQUIRED) pkg_check_modules(SNDFILE "sndfile" REQUIRED) - target_include_directories(sfizz-sndfile INTERFACE ${SNDFILE_INCLUDE_DIRS}) + target_include_directories(sfizz_sndfile INTERFACE ${SNDFILE_INCLUDE_DIRS}) if(SFIZZ_STATIC_DEPENDENCIES) - target_link_libraries(sfizz-sndfile INTERFACE ${SNDFILE_STATIC_LIBRARIES}) + target_link_libraries(sfizz_sndfile INTERFACE ${SNDFILE_STATIC_LIBRARIES}) else() - target_link_libraries(sfizz-sndfile INTERFACE ${SNDFILE_LIBRARIES}) + target_link_libraries(sfizz_sndfile INTERFACE ${SNDFILE_LIBRARIES}) endif() link_directories(${SNDFILE_LIBRARY_DIRS}) endif() @@ -121,7 +125,7 @@ endif() # The st_audiofile library if(SFIZZ_USE_SNDFILE) set(ST_AUDIO_FILE_USE_SNDFILE ON CACHE BOOL "" FORCE) - set(ST_AUDIO_FILE_EXTERNAL_SNDFILE "sfizz-sndfile" CACHE STRING "" FORCE) + set(ST_AUDIO_FILE_EXTERNAL_SNDFILE "sfizz::sndfile" CACHE STRING "" FORCE) else() set(ST_AUDIO_FILE_USE_SNDFILE OFF CACHE BOOL "" FORCE) set(ST_AUDIO_FILE_EXTERNAL_SNDFILE "" CACHE STRING "" FORCE) @@ -138,17 +142,20 @@ if(USE_LIBCPP) add_link_options(-lc++abi) # New command on CMake master, not in 3.12 release endif() -add_library(sfizz-pugixml STATIC "src/external/pugixml/src/pugixml.cpp") -target_include_directories(sfizz-pugixml PUBLIC "src/external/pugixml/src") +add_library(sfizz_pugixml STATIC "src/external/pugixml/src/pugixml.cpp") +add_library(sfizz::pugixml ALIAS sfizz_pugixml) +target_include_directories(sfizz_pugixml PUBLIC "src/external/pugixml/src") -add_library(sfizz-spline STATIC "src/external/spline/spline/spline.cpp") -target_include_directories(sfizz-spline PUBLIC "src/external/spline") +add_library(sfizz_spline STATIC "src/external/spline/spline/spline.cpp") +add_library(sfizz::spline ALIAS sfizz_spline) +target_include_directories(sfizz_spline PUBLIC "src/external/spline") -add_library(sfizz-tunings STATIC "src/external/tunings/src/Tunings.cpp") -target_include_directories(sfizz-tunings PUBLIC "src/external/tunings/include") +add_library(sfizz_tunings STATIC "src/external/tunings/src/Tunings.cpp") +add_library(sfizz::tunings ALIAS sfizz_tunings) +target_include_directories(sfizz_tunings PUBLIC "src/external/tunings/include") -include(CheckLibraryExists) -add_library(sfizz-atomic INTERFACE) +add_library(sfizz_atomic INTERFACE) +add_library(sfizz::atomic ALIAS sfizz_atomic) if(UNIX AND NOT APPLE) file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/check_libatomic") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/check_libatomic/check_libatomic.c" "int main() { return 0; }") @@ -156,7 +163,7 @@ if(UNIX AND NOT APPLE) SOURCES "${CMAKE_CURRENT_BINARY_DIR}/check_libatomic/check_libatomic.c" LINK_LIBRARIES "atomic") if(SFIZZ_LINK_LIBATOMIC) - target_link_libraries(sfizz-atomic INTERFACE "atomic") + target_link_libraries(sfizz_atomic INTERFACE "atomic") endif() else() set(SFIZZ_LINK_LIBATOMIC FALSE) diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt index 16ebcce6..ba349140 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt @@ -37,10 +37,10 @@ if(TARGET Qt5::Widgets) endif() add_executable(eq_apply EQ.cpp) -target_link_libraries(eq_apply PRIVATE sfizz::sfizz sfizz-sndfile sfizz-cxxopts) +target_link_libraries(eq_apply PRIVATE sfizz::sfizz sfizz::sndfile sfizz::cxxopts) add_executable(filter_apply Filter.cpp) -target_link_libraries(filter_apply PRIVATE sfizz::sfizz sfizz-sndfile sfizz-cxxopts) +target_link_libraries(filter_apply PRIVATE sfizz::sfizz sfizz::sndfile sfizz::cxxopts) add_executable(sfizz_plot_curve PlotCurve.cpp) target_link_libraries(sfizz_plot_curve PRIVATE sfizz::sfizz) @@ -49,13 +49,13 @@ add_executable(sfizz_plot_wavetables PlotWavetables.cpp) target_link_libraries(sfizz_plot_wavetables PRIVATE sfizz::sfizz) add_executable(sfizz_plot_lfo PlotLFO.cpp) -target_link_libraries(sfizz_plot_lfo PRIVATE sfizz::sfizz sfizz-sndfile sfizz-cxxopts) +target_link_libraries(sfizz_plot_lfo PRIVATE sfizz::sfizz sfizz::sndfile sfizz::cxxopts) add_executable(sfizz_file_instrument FileInstrument.cpp) -target_link_libraries(sfizz_file_instrument PRIVATE sfizz::sfizz sfizz-sndfile) +target_link_libraries(sfizz_file_instrument PRIVATE sfizz::sfizz sfizz::sndfile) add_executable(sfizz_file_wavetable FileWavetable.cpp) target_link_libraries(sfizz_file_wavetable PRIVATE sfizz::sfizz) add_executable(sfizz_tuning Tuning.cpp) -target_link_libraries(sfizz_tuning PRIVATE sfizz::sfizz sfizz-cxxopts) +target_link_libraries(sfizz_tuning PRIVATE sfizz::sfizz sfizz::cxxopts) diff --git a/devtools/CMakeLists.txt b/devtools/CMakeLists.txt index d64f6ba4..ac2790e6 100644 --- a/devtools/CMakeLists.txt +++ b/devtools/CMakeLists.txt @@ -10,9 +10,9 @@ find_package(Qt5 COMPONENTS Widgets) if(JACK_FOUND AND TARGET Qt5::Widgets) add_executable(sfizz_capture_eg CaptureEG.h CaptureEG.cpp) target_include_directories(sfizz_capture_eg PRIVATE . ${JACK_INCLUDE_DIRS}) - target_link_libraries(sfizz_capture_eg PRIVATE sfizz-sndfile Qt5::Widgets ${JACK_LIBRARIES}) + target_link_libraries(sfizz_capture_eg PRIVATE sfizz::sndfile Qt5::Widgets ${JACK_LIBRARIES}) set_target_properties(sfizz_capture_eg PROPERTIES AUTOUIC ON) endif() add_executable(sfizz_preprocessor Preprocessor.cpp) -target_link_libraries(sfizz_preprocessor PRIVATE sfizz_parser sfizz-cxxopts) +target_link_libraries(sfizz_preprocessor PRIVATE sfizz_parser sfizz::cxxopts) diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt index 0244666b..9517c51e 100644 --- a/editor/CMakeLists.txt +++ b/editor/CMakeLists.txt @@ -43,7 +43,7 @@ add_library(sfizz_editor STATIC EXCLUDE_FROM_ALL src/editor/utility/vstgui_before.h) target_include_directories(sfizz_editor PUBLIC "src") target_link_libraries(sfizz_editor PUBLIC sfizz_messaging) -target_link_libraries(sfizz_editor PRIVATE sfizz-vstgui) +target_link_libraries(sfizz_editor PRIVATE sfizz::vstgui) target_link_libraries(sfizz_editor PUBLIC absl::strings) if(APPLE) find_library(APPLE_APPKIT_LIBRARY "AppKit") diff --git a/editor/cmake/Vstgui.cmake b/editor/cmake/Vstgui.cmake index a3cf5dc0..41cafa99 100644 --- a/editor/cmake/Vstgui.cmake +++ b/editor/cmake/Vstgui.cmake @@ -1,4 +1,4 @@ -add_library(sfizz-vstgui STATIC EXCLUDE_FROM_ALL +add_library(sfizz_vstgui STATIC EXCLUDE_FROM_ALL "${VSTGUI_BASEDIR}/vstgui/lib/animation/animations.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/animation/animator.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/animation/timingfunctions.cpp" @@ -58,8 +58,10 @@ add_library(sfizz-vstgui STATIC EXCLUDE_FROM_ALL "${VSTGUI_BASEDIR}/vstgui/lib/platform/platformfactory.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/vstguidebug.cpp") +add_library(sfizz::vstgui ALIAS sfizz_vstgui) + if(WIN32) - target_sources(sfizz-vstgui PRIVATE + target_sources(sfizz_vstgui PRIVATE "${VSTGUI_BASEDIR}/vstgui/lib/platform/common/fileresourceinputstream.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/direct2d/d2dbitmap.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/direct2d/d2ddrawcontext.cpp" @@ -78,7 +80,7 @@ if(WIN32) "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/winstring.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/win32/wintimer.cpp") elseif(APPLE) - target_sources(sfizz-vstgui PRIVATE + target_sources(sfizz_vstgui PRIVATE "${VSTGUI_BASEDIR}/vstgui/lib/platform/common/fileresourceinputstream.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/common/genericoptionmenu.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/common/generictextedit.cpp" @@ -104,7 +106,7 @@ elseif(APPLE) "${VSTGUI_BASEDIR}/vstgui/lib/platform/mac/mactimer.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/mac/quartzgraphicspath.cpp") else() - target_sources(sfizz-vstgui PRIVATE + target_sources(sfizz_vstgui PRIVATE "${VSTGUI_BASEDIR}/vstgui/lib/platform/common/fileresourceinputstream.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/common/generictextedit.cpp" "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/cairobitmap.cpp" @@ -122,12 +124,12 @@ else() "${VSTGUI_BASEDIR}/vstgui/lib/platform/linux/x11utils.cpp") endif() -target_include_directories(sfizz-vstgui PUBLIC "${VSTGUI_BASEDIR}") +target_include_directories(sfizz_vstgui PUBLIC "${VSTGUI_BASEDIR}") if(WIN32) if (NOT MSVC) # autolinked on MSVC with pragmas - target_link_libraries(sfizz-vstgui PRIVATE + target_link_libraries(sfizz_vstgui PRIVATE "opengl32" "d2d1" "dwrite" @@ -136,7 +138,7 @@ if(WIN32) "shlwapi") endif() elseif(APPLE) - target_link_libraries(sfizz-vstgui PRIVATE + target_link_libraries(sfizz_vstgui PRIVATE "${APPLE_COREFOUNDATION_LIBRARY}" "${APPLE_FOUNDATION_LIBRARY}" "${APPLE_COCOA_LIBRARY}" @@ -161,7 +163,7 @@ else() pkg_check_modules(CAIRO REQUIRED cairo) pkg_check_modules(FONTCONFIG REQUIRED fontconfig) pkg_check_modules(GLIB REQUIRED glib-2.0) - target_include_directories(sfizz-vstgui PRIVATE + target_include_directories(sfizz_vstgui PRIVATE ${X11_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ${LIBXCB_INCLUDE_DIRS} @@ -174,7 +176,7 @@ else() ${CAIRO_INCLUDE_DIRS} ${FONTCONFIG_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}) - target_link_libraries(sfizz-vstgui PRIVATE + target_link_libraries(sfizz_vstgui PRIVATE ${X11_LIBRARIES} ${FREETYPE_LIBRARIES} ${LIBXCB_LIBRARIES} @@ -189,31 +191,31 @@ else() ${GLIB_LIBRARIES}) find_library(DL_LIBRARY "dl") if(DL_LIBRARY) - target_link_libraries(sfizz-vstgui PRIVATE "${DL_LIBRARY}") + target_link_libraries(sfizz_vstgui PRIVATE "${DL_LIBRARY}") endif() endif() if(${CMAKE_BUILD_TYPE} MATCHES "Debug") - target_compile_definitions(sfizz-vstgui PUBLIC "DEVELOPMENT") + target_compile_definitions(sfizz_vstgui PUBLIC "DEVELOPMENT") endif() if(${CMAKE_BUILD_TYPE} MATCHES "Release") - target_compile_definitions(sfizz-vstgui PUBLIC "RELEASE") + target_compile_definitions(sfizz_vstgui PUBLIC "RELEASE") endif() if(CMAKE_SYSTEM_NAME STREQUAL "Windows") # higher C++ requirement on Windows - set_property(TARGET sfizz-vstgui PROPERTY CXX_STANDARD 14) + set_property(TARGET sfizz_vstgui PROPERTY CXX_STANDARD 14) # Windows 10 RS2 DDI for custom fonts - target_compile_definitions(sfizz-vstgui PRIVATE "NTDDI_VERSION=0x0A000003") + target_compile_definitions(sfizz_vstgui PRIVATE "NTDDI_VERSION=0x0A000003") # disable custom fonts while dwrite3 API is unavailable in MinGW if(MINGW) - target_compile_definitions(sfizz-vstgui PRIVATE "VSTGUI_WIN32_CUSTOMFONT_SUPPORT=0") + target_compile_definitions(sfizz_vstgui PRIVATE "VSTGUI_WIN32_CUSTOMFONT_SUPPORT=0") endif() endif() if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - gw_target_warn(sfizz-vstgui PRIVATE + gw_target_warn(sfizz_vstgui PRIVATE "-Wno-deprecated-copy" "-Wno-deprecated-declarations" "-Wno-extra" diff --git a/lv2/CMakeLists.txt b/lv2/CMakeLists.txt index a5b8b61a..c84a93ab 100644 --- a/lv2/CMakeLists.txt +++ b/lv2/CMakeLists.txt @@ -29,7 +29,7 @@ if(SFIZZ_LV2_UI) ${PROJECT_NAME}_ui.cpp vstgui_helpers.h vstgui_helpers.cpp) - target_link_libraries(${LV2PLUGIN_PRJ_NAME}_ui sfizz_editor sfizz-vstgui) + target_link_libraries(${LV2PLUGIN_PRJ_NAME}_ui sfizz_editor sfizz::vstgui) endif() # Explicitely strip all symbols on Linux but lv2_descriptor() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index caf58f07..ed93df85 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -242,7 +242,7 @@ target_sources(sfizz_static PRIVATE target_include_directories(sfizz_static PUBLIC .) target_include_directories(sfizz_static PUBLIC external) target_link_libraries(sfizz_static PUBLIC absl::strings absl::span) -target_link_libraries(sfizz_static PRIVATE sfizz_parser sfizz_messaging absl::flat_hash_map Threads::Threads st_audiofile sfizz-pugixml sfizz-spline sfizz-tunings sfizz-kissfft sfizz-cpuid sfizz-jsl sfizz-atomic) +target_link_libraries(sfizz_static PRIVATE sfizz_parser sfizz_messaging absl::flat_hash_map Threads::Threads st_audiofile sfizz::pugixml sfizz::spline sfizz::tunings sfizz::kissfft sfizz::cpuid sfizz::jsl sfizz::atomic) set_target_properties(sfizz_static PROPERTIES OUTPUT_NAME sfizz PUBLIC_HEADER "sfizz.h;sfizz.hpp;sfizz_message.h") if(SFIZZ_USE_SNDFILE) target_compile_definitions(sfizz_static PUBLIC SFIZZ_USE_SNDFILE=1) @@ -273,7 +273,7 @@ if(SFIZZ_SHARED) ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} ${FAUST_FILES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp) target_include_directories(sfizz_shared PRIVATE .) target_include_directories(sfizz_shared PRIVATE external) - target_link_libraries(sfizz_shared PRIVATE absl::strings absl::span sfizz_parser sfizz_messaging absl::flat_hash_map Threads::Threads st_audiofile sfizz-pugixml sfizz-spline sfizz-tunings sfizz-kissfft sfizz-cpuid sfizz-jsl sfizz-atomic) + target_link_libraries(sfizz_shared PRIVATE absl::strings absl::span sfizz_parser sfizz_messaging absl::flat_hash_map Threads::Threads st_audiofile sfizz::pugixml sfizz::spline sfizz::tunings sfizz::kissfft sfizz::cpuid sfizz::jsl sfizz::atomic) if(SFIZZ_USE_SNDFILE) target_compile_definitions(sfizz_shared PUBLIC SFIZZ_USE_SNDFILE=1) target_link_libraries(sfizz_shared PUBLIC st_audiofile) diff --git a/src/external/cpuid/CMakeLists.txt b/src/external/cpuid/CMakeLists.txt index d4e779be..c2a25fe5 100644 --- a/src/external/cpuid/CMakeLists.txt +++ b/src/external/cpuid/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required (VERSION 3.5) -project(sfizz-cpuid) +project(sfizz_cpuid) -add_library(sfizz-cpuid STATIC src/cpuid/cpuinfo.cpp src/cpuid/version.cpp) -set_property(TARGET sfizz-cpuid PROPERTY CXX_STANDARD 11) -target_include_directories(sfizz-cpuid PUBLIC src PRIVATE platform/src) +add_library(sfizz_cpuid STATIC src/cpuid/cpuinfo.cpp src/cpuid/version.cpp) +add_library(sfizz::cpuid ALIAS sfizz_cpuid) +set_property(TARGET sfizz_cpuid PROPERTY CXX_STANDARD 11) +target_include_directories(sfizz_cpuid PUBLIC src PRIVATE platform/src) diff --git a/src/external/kiss_fft/CMakeLists.txt b/src/external/kiss_fft/CMakeLists.txt index dc5c22e9..e43afb1d 100644 --- a/src/external/kiss_fft/CMakeLists.txt +++ b/src/external/kiss_fft/CMakeLists.txt @@ -2,11 +2,12 @@ cmake_minimum_required(VERSION 3.5) -project(sfizz-kissfft VERSION "1.3.0" LANGUAGES C) +project(sfizz_kissfft VERSION "1.3.0" LANGUAGES C) -add_library(sfizz-kissfft STATIC +add_library(sfizz_kissfft STATIC kiss_fft.c tools/kiss_fftr.c) -target_include_directories(sfizz-kissfft +add_library(sfizz::kissfft ALIAS sfizz_kissfft) +target_include_directories(sfizz_kissfft PUBLIC "." PUBLIC "tools") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index afee85a8..8d4d34a2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -48,7 +48,7 @@ set(SFIZZ_TEST_SOURCES ) add_executable(sfizz_tests ${SFIZZ_TEST_SOURCES}) -target_link_libraries(sfizz_tests PRIVATE sfizz::sfizz sfizz-jsl) +target_link_libraries(sfizz_tests PRIVATE sfizz::sfizz sfizz::jsl) sfizz_enable_lto_if_needed(sfizz_tests) sfizz_enable_fast_math(sfizz_tests) # target_link_libraries(sfizz_tests PRIVATE absl::strings absl::str_format absl::flat_hash_map cnpy absl::span absl::algorithm) diff --git a/vst/CMakeLists.txt b/vst/CMakeLists.txt index 6fef1424..468b6f1f 100644 --- a/vst/CMakeLists.txt +++ b/vst/CMakeLists.txt @@ -60,7 +60,7 @@ endif() target_link_libraries(${VSTPLUGIN_PRJ_NAME} PRIVATE ${PROJECT_NAME}::${PROJECT_NAME} PRIVATE sfizz_editor - PRIVATE sfizz-pugixml) + PRIVATE sfizz::pugixml) target_include_directories(${VSTPLUGIN_PRJ_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") set_target_properties(${VSTPLUGIN_PRJ_NAME} PROPERTIES @@ -198,7 +198,7 @@ elseif(SFIZZ_AU) target_link_libraries(${AUPLUGIN_PRJ_NAME} PRIVATE ${PROJECT_NAME}::${PROJECT_NAME} PRIVATE sfizz_editor - PRIVATE sfizz-pugixml) + PRIVATE sfizz::pugixml) target_include_directories(${AUPLUGIN_PRJ_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}") set_target_properties(${AUPLUGIN_PRJ_NAME} PROPERTIES diff --git a/vst/cmake/Vst3.cmake b/vst/cmake/Vst3.cmake index 20eee6b3..449467ce 100644 --- a/vst/cmake/Vst3.cmake +++ b/vst/cmake/Vst3.cmake @@ -63,7 +63,7 @@ endfunction() # --- VSTGUI --- function(plugin_add_vstgui NAME) - target_link_libraries("${NAME}" PRIVATE sfizz-vstgui) + target_link_libraries("${NAME}" PRIVATE sfizz::vstgui) target_sources("${NAME}" PRIVATE "${VST3SDK_BASEDIR}/public.sdk/source/vst/vstguieditor.cpp") target_compile_definitions("${NAME}" PRIVATE "SMTG_MODULE_IS_BUNDLE=1") endfunction()