Fix vcpkg builds (#7702)
* Try to fix MSVC linker error related to lilv * Remove temporary workaround * Temporary debugging messages * oops * Temporary debugging * Try to find FluidSynth using Config mode first * Try again to fix lilv * Fix FluidSynth installed with vcpkg on Windows * Fix lilv from vcpkg * Remove debug flag * Fix for when lilv is not found (*-NOTFOUND evaluates to false) * Use lowercase package name for lv2 * Try using only pkg_check_modules for lv2 * Use Lilv::lilv * Add pkg-config guard back in * Fix package name Co-authored-by: Tres Finocchiaro <tres.finocchiaro@gmail.com> * Fix Lilv_INCLUDE_DIRS * Rename vcpkg cache key --------- Co-authored-by: Tres Finocchiaro <tres.finocchiaro@gmail.com>
This commit is contained in:
@@ -22,7 +22,7 @@ find_path(FluidSynth_INCLUDE_DIR
|
||||
)
|
||||
|
||||
find_library(FluidSynth_LIBRARY
|
||||
NAMES "fluidsynth"
|
||||
NAMES "fluidsynth" "fluidsynth-3" "fluidsynth-2" "fluidsynth-1"
|
||||
HINTS ${FLUIDSYNTH_PKG_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
|
||||
19
cmake/modules/FindLilv.cmake
Normal file
19
cmake/modules/FindLilv.cmake
Normal file
@@ -0,0 +1,19 @@
|
||||
# Copyright (c) 2025 Dalton Messmer <messmer.dalton/at/gmail.com>
|
||||
#
|
||||
# Redistribution and use is allowed according to the terms of the New BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
include(ImportedTargetHelpers)
|
||||
|
||||
find_package_config_mode_with_fallback(Lilv Lilv::lilv
|
||||
LIBRARY_NAMES "lilv" "lilv-0"
|
||||
INCLUDE_NAMES "lilv/lilv.h"
|
||||
PKG_CONFIG "lilv-0"
|
||||
)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
|
||||
find_package_handle_standard_args(Lilv
|
||||
REQUIRED_VARS Lilv_LIBRARY Lilv_INCLUDE_DIRS
|
||||
VERSION_VAR Lilv_VERSION
|
||||
)
|
||||
Reference in New Issue
Block a user