mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:23:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix-libfind-pkg-detect' into 'master'

Browse source 
cmake: Fix MyGUI detection

See merge request OpenMW/openmw!535
This commit is contained in:
psi29a 2021-01-14 14:56:44 +00:00
commit 4e39e0b01d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmake/LibFindMacros.cmake
View file

@ -19,11 +19,11 @@ macro (libfind_package PREFIX PKG)
endmacro() endmacro()
# A simple wrapper to make pkg-config searches a bit easier. # A simple wrapper to make pkg-config searches a bit easier.
# Works the same as CMake's internal pkg_check_modules but is always quiet. # Works the same as CMake's internal pkg_search_module but is always quiet.
macro (libfind_pkg_check_modules) macro (libfind_pkg_search_module)
find_package(PkgConfig QUIET) find_package(PkgConfig QUIET)
if (PKG_CONFIG_FOUND) if (PKG_CONFIG_FOUND)
pkg_check_modules(${ARGN} QUIET) pkg_search_module(${ARGN} QUIET)
endif() endif()
endmacro() endmacro()
@ -47,7 +47,7 @@ function (libfind_pkg_detect PREFIX)
message(FATAL_ERROR "libfind_pkg_detect requires at least a pkg_config package name to be passed.") message(FATAL_ERROR "libfind_pkg_detect requires at least a pkg_config package name to be passed.")
endif() endif()
# Find library # Find library
libfind_pkg_check_modules(${PREFIX}_PKGCONF ${pkgargs}) libfind_pkg_search_module(${PREFIX}_PKGCONF ${pkgargs})
if (pathargs) if (pathargs)
find_path(${PREFIX}_INCLUDE_DIR NAMES ${pathargs} HINTS ${${PREFIX}_PKGCONF_INCLUDE_DIRS}) find_path(${PREFIX}_INCLUDE_DIR NAMES ${pathargs} HINTS ${${PREFIX}_PKGCONF_INCLUDE_DIRS})
endif() endif()