Hey guys, I just pulled down the latest and it looks something with the OSG upgrade broke the build on OSX. I pulled down the latest dependencies and copied them to the tools directory, but now i get the following error:
Project MESSAGE: Using osgearth from here: /Users/cmorton/projects/librepilot/tools/osgearth-2.7-clang_64-qt-5.5.1
make[4]: Leaving directory `/Users/cmorton/projects/librepilot/build/librepilot-gcs_release/src/libs/osgearth'
make[4]: Entering directory `/Users/cmorton/projects/librepilot/build/librepilot-gcs_release/src/libs/osgearth'
/usr/bin/g++ -c -pipe -stdlib=libc++ -Wno-unused-parameter -Wno-unused-parameter -O2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -mmacosx-version-min=10.7 -w -fPIC -DOSGEARTH_LIBRARY -DUSE_OSG -DUSE_OSGEARTH -DORG_BIG_NAME='"LibrePilot"' -DGCS_BIG_NAME='"LibrePilot GCS"' -DORG_SMALL_NAME='"librepilot"' -DGCS_SMALL_NAME='"librepilot-gcs"' -DWIKI_URL_ROOT='"
https://librepilot.atlassian.net/wiki/display/LPDOC/"' -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I/Users/cmorton/projects/librepilot/ground/gcs/src/libs/osgearth -I. -I/Users/cmorton/projects/librepilot/ground/gcs/src/libs -I/Users/cmorton/projects/librepilot/tools/osg-3.5.1-clang_64-qt-5.5.1/include -I/Users/cmorton/projects/librepilot/tools/osgearth-2.7-clang_64-qt-5.5.1/include -I/Users/cmorton/projects/librepilot/tools/qt-5.5.1/5.5/clang_64/lib/QtOpenGL.framework/Headers -I/Users/cmorton/projects/librepilot/tools/qt-5.5.1/5.5/clang_64/lib/QtWidgets.framework/Headers -I/Users/cmorton/projects/librepilot/tools/qt-5.5.1/5.5/clang_64/lib/QtQuick.framework/Headers -I/Users/cmorton/projects/librepilot/tools/qt-5.5.1/5.5/clang_64/lib/QtGui.framework/Headers -I/Users/cmorton/projects/librepilot/tools/qt-5.5.1/5.5/clang_64/lib/QtQml.framework/Headers -I/Users/cmorton/projects/librepilot/tools/qt-5.5.1/5.5/clang_64/lib/QtNetwork.framework/Headers -I/Users/cmorton/projects/librepilot/tools/qt-5.5.1/5.5/clang_64/lib/QtCore.framework/Headers -I.moc/release-shared -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/OpenGL.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/AGL.framework/Headers -I/Users/cmorton/projects/librepilot/tools/qt-5.5.1/5.5/clang_64/mkspecs/macx-clang -F/Users/cmorton/projects/librepilot/tools/qt-5.5.1/5.5/clang_64/lib -o .obj/release-shared/utility.o /Users/cmorton/projects/librepilot/ground/gcs/src/libs/osgearth/utility.cpp
cp -f -R /Users/cmorton/projects/librepilot/tools/osg-3.5.1-clang_64-qt-5.5.1/lib/* '/Users/cmorton/projects/librepilot/build/librepilot-gcs_release/LibrePilot GCS.app/Contents/Plugins/'
cp -f -R /Users/cmorton/projects/librepilot/tools/osgearth-2.7-clang_64-qt-5.5.1/lib/* '/Users/cmorton/projects/librepilot/build/librepilot-gcs_release/LibrePilot GCS.app/Contents/Plugins/'
In file included from /Users/cmorton/projects/librepilot/ground/gcs/src/libs/osgearth/utility.cpp:66:
/Users/cmorton/projects/librepilot/tools/osgearth-2.7-clang_64-qt-5.5.1/include/osgEarth/ElevationQuery:40:32: error: virtual function 'readNodeFile'
has a different return type ('osg::Node *') than the function it overrides (which has return type 'osg::ref_ptr<osg::Node>')
virtual osg::Node* readNodeFile(const std::string& filename);
~~~~~~~~~~ ^
/Users/cmorton/projects/librepilot/tools/osg-3.5.1-clang_64-qt-5.5.1/include/osgUtil/IntersectionVisitor:163:45: note: overridden virtual function is
here
virtual osg::ref_ptr<osg::Node> readNodeFile(const std::string& filename) = 0;
~~~~~~~~~~~~~~~~~~~~~~~ ^
1 error generated.
make[4]: *** [.obj/release-shared/utility.o] Error 1
make[4]: Leaving directory `/Users/cmorton/projects/librepilot/build/librepilot-gcs_release/src/libs/osgearth'
make[3]: *** [sub-osgearth-make_first-ordered] Error 2
make[3]: Leaving directory `/Users/cmorton/projects/librepilot/build/librepilot-gcs_release/src/libs'
make[2]: *** [sub-libs-make_first-ordered] Error 2
make[2]: Leaving directory `/Users/cmorton/projects/librepilot/build/librepilot-gcs_release/src'
make[1]: *** [sub-src-make_first-ordered] Error 2
make[1]: Leaving directory `/Users/cmorton/projects/librepilot/build/librepilot-gcs_release'
make: *** [gcs] Error 2
ldt-7mdcqc1:librepilot cmorton$
I think this has to do with the addition of the osg-3.5.1.patch file but im trying to figure out if there is a particular build step that applies it or if its best for me to just apply it myself. Can someone help?
Casey