Merge branch 'next' into 'next'

Fix CMake not finding OpenMPT on Haiku

See merge request STJr/SRB2!2570
This commit is contained in:
Alam Ed Arias 2025-01-10 06:33:16 +00:00
commit 3a0c38e418

View file

@ -1,14 +1,16 @@
include(LibFindMacros)
libfind_pkg_check_modules(libopenmpt_PKGCONF openmpt)
libfind_pkg_check_modules(libopenmpt_PKGCONF openmpt libopenmpt)
find_path(libopenmpt_INCLUDE_DIR
NAMES libopenmpt.h
PATHS
${libopenmpt_PKGCONF_INCLUDE_DIRS}
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/libopenmpt"
"/usr/include/libopenmpt"
"/usr/local/include/libopenmpt"
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include"
"/usr/include"
"/usr/local/include"
PATH_SUFFIXES
+ libopenmpt
)
find_library(libopenmpt_LIBRARY