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

[Mourad Boufarguine]

Hi Robert,

Builds and osgviewer runs fine with VS 2015 Win64.
I got these debug output to the console :

_forceVertexArrayObject = 0
_forceVertexBufferObject = 0
_forceVertexArrayObject = 0
_forceVertexBufferObject = 0
_forceVertexArrayObject = 0
_forceVertexBufferObject = 0
ViewerBase::configureAffinity() numProcessors=8
  databasePagers = 1

Cheers,
Mourad

On Mon, May 15, 2017 at 3:56 PM, Robert Osfield <robert.osfield at gmail.com>
wrote:

> Hi Mourad,
>
> On 15 May 2017 at 14:52, Mourad Boufarguine
> <mourad.boufarguine at gmail.com> wrote:
> > You're right we need both :
> >
> > COLLADA_BOOST_BUILDNAME : to follow boost naming convention with 3 digits
> > for MSVC toolset version
> > COLLADA_BUILDNAME : to follow collada naming convention with 1/2 digits
> for
> > MSVC toolset version
>
> I've been thinking along the same lines, I've refactored the
> FindCOLLADA.cmake to use a combination of your and Toroben's versions,
> the changes are :
>
>
> diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.
> cmake
> index f086069..5fb2cec 100644
> --- a/CMakeModules/FindCOLLADA.cmake
> +++ b/CMakeModules/FindCOLLADA.cmake
> @@ -23,37 +23,38 @@ ELSE ()
>  ENDIF()
>
>
> -
> -
> -
>  IF(APPLE)
>      SET(COLLADA_BUILDNAME "mac")
> -    SET(COLLADA_BOOST_BUILDNAME "mac")
> +  SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
>  ELSEIF(MINGW)
>      SET(COLLADA_BUILDNAME "mingw")
> -    SET(COLLADA_BOOST_BUILDNAME "mingw")
> -ELSEIF(MSVC14)
> +  SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
> +ELSEIF(MSVC_VERSION EQUAL 1900 OR MSVC_VERSION EQUAL 1910 )
>      SET(COLLADA_BUILDNAME "vc14")
> -    string(REPLACE "v" "vc" COLLADA_BOOST_BUILDNAME
> ${CMAKE_VS_PLATFORM_TOOLSET})
> -ELSEIF(MSVC12)
> +    SET(COLLADA_BOOST_BUILDNAME "vc140")
> +ELSEIF(MSVC_VERSION EQUAL 1800)
>      SET(COLLADA_BUILDNAME "vc12")
> -    string(REPLACE "v" "vc" COLLADA_BOOST_BUILDNAME
> ${CMAKE_VS_PLATFORM_TOOLSET})
> -ELSEIF(MSVC11)
> +    SET(COLLADA_BOOST_BUILDNAME "vc120")
> +ELSEIF(MSVC_VERSION EQUAL 1700)
>      SET(COLLADA_BUILDNAME "vc11")
> -    string(REPLACE "v" "vc" COLLADA_BOOST_BUILDNAME
> ${CMAKE_VS_PLATFORM_TOOLSET})
> -ELSEIF(MSVC10)
> +    SET(COLLADA_BOOST_BUILDNAME "vc110")
> +ELSEIF(MSVC_VERSION EQUAL 1600)
>      SET(COLLADA_BUILDNAME "vc10")
> -    string(REPLACE "v" "vc" COLLADA_BOOST_BUILDNAME
> ${CMAKE_VS_PLATFORM_TOOLSET})
> -ELSEIF(MSVC90)
> +    SET(COLLADA_BOOST_BUILDNAME "vc100")
> +ELSEIF(MSVC_VERSION EQUAL 1500)
>      SET(COLLADA_BUILDNAME "vc9")
> -    string(REPLACE "v" "vc" COLLADA_BOOST_BUILDNAME
> ${CMAKE_VS_PLATFORM_TOOLSET})
> -ELSEIF(MSVC80)
> +    SET(COLLADA_BOOST_BUILDNAME "vc90")
> +ELSEIF(MSVC_VERSION EQUAL 1400)
>      SET(COLLADA_BUILDNAME "vc8")
> -    string(REPLACE "v" "vc" COLLADA_BOOST_BUILDNAME
> ${CMAKE_VS_PLATFORM_TOOLSET})
> -ELSE(APPLE)
> +    SET(COLLADA_BOOST_BUILDNAME "vc80")
> +ELSE()
>    SET(COLLADA_BUILDNAME "linux")
> -  SET(COLLADA_BOOST_BUILDNAME "linux")
> -ENDIF(APPLE)
> +  SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
> +ENDIF()
> +
> +IF(${CMAKE_VS_PLATFORM_TOOLSET})
> +    string(REPLACE "v" "vc" COLLADA_BOOST_BUILDNAME
> ${CMAKE_VS_PLATFORM_TOOLSET})
> +ENDIF()
>
>
> I have now checked this into git master, I'd appreciate testing out
> under Windows, fingers crossed we are getting a bit closer.
>
> Robert.
> _______________________________________________
> osg-users mailing list
> osg-users at lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openscenegraph.org/pipermail/osg-users-openscenegraph.org/attachments/20170516/39a663ee/attachment-0002.htm>