FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #733 from eknabe/master

Browse Source 
Collada (DAE) support recognized for VisualStudio 2017
This commit is contained in:
OpenSceneGraph git repository 2019-03-26 08:01:31 +00:00 committed by GitHub
commit efd8ef9e7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeModules/FindCOLLADA.cmake
View File

@ -29,9 +29,12 @@ IF(APPLE)
ELSEIF(MINGW) ELSEIF(MINGW)
SET(COLLADA_BUILDNAME "mingw") SET(COLLADA_BUILDNAME "mingw")
SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
ELSEIF((MSVC_VERSION GREATER 1900) OR (MSVC_VERSION EQUAL 1900)) ELSEIF((MSVC_VERSION GREATER 1910) OR (MSVC_VERSION EQUAL 1910))
SET(COLLADA_BUILDNAME "vc14") SET(COLLADA_BUILDNAME "vc14")
SET(COLLADA_BOOST_BUILDNAME "vc140") SET(COLLADA_BOOST_BUILDNAME "vc141")
ELSEIF(MSVC_VERSION EQUAL 1900)
SET(COLLADA_BUILDNAME "vc14")
SET(COLLADA_BOOST_BUILDNAME "vc140")
ELSEIF(MSVC_VERSION EQUAL 1800) ELSEIF(MSVC_VERSION EQUAL 1800)
SET(COLLADA_BUILDNAME "vc12") SET(COLLADA_BUILDNAME "vc12")
SET(COLLADA_BOOST_BUILDNAME "vc120") SET(COLLADA_BOOST_BUILDNAME "vc120")