From 2f2fa8624289250b7ef07ce63e92e019d0a11036 Mon Sep 17 00:00:00 2001 From: beaglejoe Date: Wed, 21 Aug 2019 04:02:41 +0000 Subject: [PATCH] Code to find OSG 3.6.4 git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6718 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: f947e278e9d46fd2febb2c88d57dfdcd62d12945 Former-commit-id: 61eb05f7ba48a25f1287f491c39d3884aa375819 --- cmake/customthirdparty.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/customthirdparty.cmake b/cmake/customthirdparty.cmake index cbca6db2d..d2ddedc1b 100644 --- a/cmake/customthirdparty.cmake +++ b/cmake/customthirdparty.cmake @@ -341,7 +341,7 @@ MACRO(SD_INSTALL_CUSTOM_3RDPARTY TARGET_NAME) FOREACH(_LIB_NAME ${OPENSCENEGRAPH_LIBRARIES}) FOREACH(_NAME_HINT ${_OSG_DLLS_NAME_HINTS}) IF("${_LIB_NAME}" MATCHES "${_NAME_HINT}\\.") - _FIND_3RDPARTY_DLL("${_LIB_NAME}" "${_NAME_HINT}" "lib;ot12-;ot20-;ot21-;osg80-;osg97-;osg100-;osg118-;osg123-;osg130-;osg131-;osg158-" _DLL_PATHNAME) + _FIND_3RDPARTY_DLL("${_LIB_NAME}" "${_NAME_HINT}" "lib;ot12-;ot20-;ot21-;osg80-;osg97-;osg100-;osg118-;osg123-;osg130-;osg131-;osg158-;osg160-" _DLL_PATHNAME) SET(_NAME_HINT_ "${_NAME_HINT}") # For later (see below DLLs we don't link with). SET(_LIB_NAME_ "${_LIB_NAME}") # For later (see below DLLs we don't link with). SET(_DLL_PATHNAME_ "${_DLL_PATHNAME}") # For later (see below plugins). @@ -356,7 +356,7 @@ MACRO(SD_INSTALL_CUSTOM_3RDPARTY TARGET_NAME) SET(_EXTRA_OSG_DLLS_NAME_HINTS "osgText") # ';'-separated list FOREACH(_NAME_HINT ${_EXTRA_OSG_DLLS_NAME_HINTS}) STRING(REPLACE "${_NAME_HINT_}" "${_NAME_HINT}" _LIB_NAME "${_LIB_NAME_}") - _FIND_3RDPARTY_DLL("${_LIB_NAME}" "${_NAME_HINT}" ";lib;ot12-;ot20-;ot21-;osg80-;osg97-;osg100-;osg118-;osg123-;osg130-;osg131-;osg158-" _DLL_PATHNAME) + _FIND_3RDPARTY_DLL("${_LIB_NAME}" "${_NAME_HINT}" ";lib;ot12-;ot20-;ot21-;osg80-;osg97-;osg100-;osg118-;osg123-;osg130-;osg131-;osg158-;osg160-" _DLL_PATHNAME) LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}") ENDFOREACH()