From f263ad29db67ce0bab4dd29cc0bfc63d38191f79 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Tue, 26 Mar 2019 06:52:09 +0100 Subject: [PATCH] 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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index 8c9c2fc33..7c7d29053 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -25,11 +25,14 @@ ENDIF() IF(APPLE) SET(COLLADA_BUILDNAME "mac") - SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) + SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) ELSEIF(MINGW) SET(COLLADA_BUILDNAME "mingw") - SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) -ELSEIF(MSVC_VERSION EQUAL 1900 OR MSVC_VERSION EQUAL 1910 ) + SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME}) +ELSEIF((MSVC_VERSION GREATER 1910) OR (MSVC_VERSION EQUAL 1910)) + SET(COLLADA_BUILDNAME "vc14") + SET(COLLADA_BOOST_BUILDNAME "vc141") +ELSEIF(MSVC_VERSION EQUAL 1900) SET(COLLADA_BUILDNAME "vc14") SET(COLLADA_BOOST_BUILDNAME "vc140") ELSEIF(MSVC_VERSION EQUAL 1800)