From ad69a7fc8ee9324b95105cbfd89f2a615ad570af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 14 Feb 2020 09:53:23 +0800 Subject: [osg]Fix windows-dynamic/linux build. (#8060) * [osg]Fix dynamic build. * [sdl1]Fix linux command. * [osg]Fix linux build: disable present3D and osgstaticview. * [osg]fix windows build-only for windows. * [osg]Fix file INSTALL error. * [osg]Add dependency conditions. * [osg]disable OSG_USE_UTF8_FILENAME in Linux and OSX. * [osg]Fix find dependency curl. Replace version num by macro. * [osg]Add option CMAKE_CXX_STANDARD * [osg] Remove library prefix. * [osg] Fix install pdbs * [osg] Remove usless plugin libs. * update baseline * update baseline * update baseline * update baseline --- scripts/ci.baseline.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e85acfcc7..b221eef53 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1327,9 +1327,11 @@ opusfile:x64-uwp=fail orc:x64-linux=ignore orocos-kdl:arm-uwp=fail orocos-kdl:x64-uwp=fail -osg:x64-linux=fail -osg:x64-osx=fail -osg:x64-windows-static=fail +osgearth:x64-osx=fail +osgearth:x64-linux=fail +osgearth:x64-windows-static=fail +osg-qt:x64-linux=fail +osg-qt:x64-windows-static=fail otl:x64-windows=ignore otl:x64-windows-static=ignore otl:x64-uwp=ignore -- cgit v1.2.3