stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 15:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'next' into 'next'

Browse source 
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
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmake/Modules/Findlibopenmpt.cmake
View file

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