From 8bd4d9ef498c4919c94d4d0e846ead2159007326 Mon Sep 17 00:00:00 2001 From: Emil Knabe Date: Sat, 23 Mar 2019 13:14:24 +0100 Subject: [PATCH 1/2] Updating DAE support for vc141 (VisualStudio2017), aligned with 3rdParty package --- CMakeModules/FindCOLLADA.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index 9c853dec9..6190c5f03 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -29,9 +29,12 @@ IF(APPLE) ELSEIF(MINGW) SET(COLLADA_BUILDNAME "mingw") SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) -ELSEIF((MSVC_VERSION GREATER 1900) OR (MSVC_VERSION EQUAL 1900)) +ELSEIF(MSVC_VERSION GREATER_EQUAL 1910) 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) SET(COLLADA_BUILDNAME "vc12") SET(COLLADA_BOOST_BUILDNAME "vc120") From 36cceb693078aa56c0c8e418b34e750fdd792f04 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Tue, 26 Mar 2019 06:52:09 +0100 Subject: [PATCH 2/2] Update CMakeModules/FindCOLLADA.cmake Keeping old style operator to align with OSG CMake 2.8.0 support. Co-Authored-By: eknabe <44489094+eknabe@users.noreply.github.com> --- CMakeModules/FindCOLLADA.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index 6190c5f03..3ea7bc76e 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -29,7 +29,7 @@ IF(APPLE) ELSEIF(MINGW) SET(COLLADA_BUILDNAME "mingw") SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) -ELSEIF(MSVC_VERSION GREATER_EQUAL 1910) +ELSEIF((MSVC_VERSION GREATER 1910) OR (MSVC_VERSION EQUAL 1910)) SET(COLLADA_BUILDNAME "vc14") SET(COLLADA_BOOST_BUILDNAME "vc141") ELSEIF(MSVC_VERSION EQUAL 1900)