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 'recastnavigation_custom_path' into 'master'

Browse source 
Support custom path for recastnavigation

See merge request OpenMW/openmw!635
This commit is contained in:
psi29a 2021-03-04 18:12:28 +00:00
commit d990c425b8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmake/FindRecastNavigation.cmake
View file

@ -65,8 +65,8 @@ NOTE: The variables above should not usually be used in CMakeLists.txt files!
### Find libraries ##############################################################
if(NOT RECAST_LIBRARY)
find_library(RECAST_LIBRARY_RELEASE NAMES Recast)
find_library(RECAST_LIBRARY_DEBUG NAMES Recastd)
find_library(RECAST_LIBRARY_RELEASE NAMES Recast HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
find_library(RECAST_LIBRARY_DEBUG NAMES Recast-d HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
include(SelectLibraryConfigurations)
select_library_configurations(RECAST)
mark_as_advanced(RECAST_LIBRARY_RELEASE RECAST_LIBRARY_DEBUG)
@ -75,8 +75,8 @@ else()
endif()
if(NOT DETOUR_LIBRARY)
find_library(DETOUR_LIBRARY_RELEASE NAMES Detour)
find_library(DETOUR_LIBRARY_DEBUG NAMES Detourd)
find_library(DETOUR_LIBRARY_RELEASE NAMES Detour HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
find_library(DETOUR_LIBRARY_DEBUG NAMES Detour-d HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
include(SelectLibraryConfigurations)
select_library_configurations(DETOUR)
mark_as_advanced(DETOUR_LIBRARY_RELEASE DETOUR_LIBRARY_DEBUG)
@ -85,8 +85,8 @@ else()
endif()
if(NOT DEBUGUTILS_LIBRARY)
find_library(DEBUGUTILS_LIBRARY_RELEASE NAMES DebugUtils)
find_library(DEBUGUTILS_LIBRARY_DEBUG NAMES DebugUtilsd)
find_library(DEBUGUTILS_LIBRARY_RELEASE NAMES DebugUtils HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
find_library(DEBUGUTILS_LIBRARY_DEBUG NAMES DebugUtils-d HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES lib)
include(SelectLibraryConfigurations)
select_library_configurations(DEBUGUTILS)
mark_as_advanced(DEBUGUTILS_LIBRARY_RELEASE DEBUGUTILS_LIBRARY_DEBUG)
@ -95,7 +95,7 @@ else()
endif()
### Find include directory ####################################################
find_path(RECAST_INCLUDE_DIR NAMES Recast.h PATH_SUFFIXES include RECAST include/recastnavigation)
find_path(RECAST_INCLUDE_DIR NAMES Recast.h HINTS ${RECASTNAVIGATION_ROOT} PATH_SUFFIXES include RECAST include/recastnavigation)
mark_as_advanced(RECAST_INCLUDE_DIR)
if(RECAST_INCLUDE_DIR AND EXISTS "${RECAST_INCLUDE_DIR}/Recast.h")