[osg-users] Call for testing, preparing for 3.5.6 dev release again :-)

Robert Osfield robert.osfield at gmail.com
Mon May 15 05:50:28 PDT 2017


On 15 May 2017 at 13:08, Robert Osfield <robert.osfield at gmail.com> wrote:
> Looks like we'll need to rewrite this problem block for the case when
> CMAKE_VS_PLATFORM_TOOLSET is not set.
>
> Don't yet know what this might be though...

Would the following approach work better?

-- Modified CMakeModues/FindCOLLADA.camke script :

IF(APPLE)
    SET(COLLADA_BUILDNAME "mac")
ELSEIF(MINGW)
    SET(COLLADA_BUILDNAME "mingw")
ELSEIF(MSVC14)
    SET(COLLADA_BUILDNAME "vc14")
ELSEIF(MSVC12)
    SET(COLLADA_BUILDNAME "vc12")
ELSEIF(MSVC11)
    SET(COLLADA_BUILDNAME "vc11")
ELSEIF(MSVC10)
    SET(COLLADA_BUILDNAME "vc10")
ELSEIF(MSVC90)
    SET(COLLADA_BUILDNAME "vc9")
ELSEIF(MSVC80)
    SET(COLLADA_BUILDNAME "vc8")
ELSE()
  SET(COLLADA_BUILDNAME "linux")
ENDIF()

SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BOOST_BUILDNAME})

IF(${CMAKE_VS_PLATFORM_TOOLSET})
    string(REPLACE "v" "vc" COLLADA_BOOST_BUILDNAME
${CMAKE_VS_PLATFORM_TOOLSET})
ENDIF()

--

I've moved the string(REPLACE...) lines into a single block wrapped in a check.

Robert.



More information about the osg-users mailing list