speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity Actions 5

Allow windows to detect OSG 3.4rc

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6062 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: a88433927bedb3753acf2b7c8b8c155db618a971
Former-commit-id: a669707d6d4d82f594ec6cf50af1bcb9e45a9444
This commit is contained in:
beaglejoe 2015-08-09 04:36:49 +00:00
parent c291296afb
commit 68c1cf727f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmake/customthirdparty.cmake
View file

@ -335,7 +335,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-;osg80-;osg97-;osg100-;osg118-;osg123-" _DLL_PATHNAME)
_FIND_3RDPARTY_DLL("${_LIB_NAME}" "${_NAME_HINT}" "lib;ot12-;ot20-;osg80-;osg97-;osg100-;osg118-;osg123-;osg130-" _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).
@ -350,7 +350,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-;osg80-;osg97-;osg100-;osg118-;osg123-" _DLL_PATHNAME)
_FIND_3RDPARTY_DLL("${_LIB_NAME}" "${_NAME_HINT}" ";lib;ot12-;ot20-;osg80-;osg97-;osg100-;osg118-;osg123-;osg130-" _DLL_PATHNAME)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
ENDFOREACH()