Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6240 from ZappoMan/fixWarnings

Browse source 
fix some warnings and tweak cmake to have better name for disabled external dependency
This commit is contained in:
Andrew Meadows 2015-10-30 09:25:45 -07:00
commit cb8b8e194c
5 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -185,21 +185,6 @@ set(EXTERNAL_PROJECT_PREFIX "project")
set_property(DIRECTORY PROPERTY EP_PREFIX ${EXTERNAL_PROJECT_PREFIX})
setup_externals_binary_dir()
# setup options to grab external project dependencies
#option(GET_BULLET "Get Bullet library automatically as external project" 1)
#option(GET_GLM "Get GLM library automatically as external project" 1)
#option(GET_GVERB "Get Gverb library automatically as external project" 1)
#option(GET_TBB "Get Threading Building Blocks library automatically as external project" 1)
#option(GET_LIBOVR "Get LibOVR library automatically as external project" 1)
#option(GET_VHACD "Get V-HACD library automatically as external project" 1)
#option(GET_POLYVOX "Get polyvox library automatically as external project" 1)
#option(GET_OPENVR "Get OpenVR library automatically as external project" 1)
#option(GET_BOOSTCONFIG "Get Boost-config library automatically as external project" 1)
#option(GET_OGLPLUS "Get OGLplus library automatically as external project" 1)
#option(GET_GLEW "Get GLEW library automatically as external project" 1)
#option(GET_SDL2 "Get SDL2 library automatically as external project" 1)
#option(GET_SIXENSE "Get Sixense library automatically as external project" 1)
option(USE_NSIGHT "Attempt to find the nSight libraries" 1)

2
cmake/macros/AddDependencyExternalProjects.cmake
View file

@ -16,7 +16,7 @@ macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS)
string(TOUPPER ${_PROJ_NAME} _PROJ_NAME_UPPER)
# has the user told us they specific don't want this as an external project?
if (NOT DISABLE_${_PROJ_NAME_UPPER})
if (NOT USE_LOCAL_${_PROJ_NAME_UPPER})
# have we already detected we can't have this as external project on this OS?
if (NOT DEFINED ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT OR ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT)
# have we already setup the target?

3
libraries/gl/src/gl/GlWindow.cpp
View file

@ -44,8 +44,7 @@ bool GlWindow::makeCurrent() {
qDebug() << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
});
QOpenGLContext * currentContext = QOpenGLContext::currentContext();
Q_ASSERT(_context == currentContext);
Q_ASSERT(_context == QOpenGLContext::currentContext());
return makeCurrentResult;
}

4
libraries/physics/src/CharacterController.cpp
View file

@ -14,11 +14,11 @@
#include "PhysicsCollisionGroups.h"
bool CharacterController::needsRemoval() const {
return (bool)(_pendingFlags & PENDING_FLAG_REMOVE_FROM_SIMULATION);
return ((_pendingFlags & PENDING_FLAG_REMOVE_FROM_SIMULATION) == PENDING_FLAG_REMOVE_FROM_SIMULATION);
}
bool CharacterController::needsAddition() const {
return (bool)(_pendingFlags & PENDING_FLAG_ADD_TO_SIMULATION);
return ((_pendingFlags & PENDING_FLAG_ADD_TO_SIMULATION) == PENDING_FLAG_ADD_TO_SIMULATION);
}
void CharacterController::setDynamicsWorld(btDynamicsWorld* world) {

4
libraries/ui/src/VrMenu.cpp
View file

@ -113,6 +113,7 @@ void VrMenu::addMenu(QMenu* menu) {
Q_ARG(QVariant, QVariant::fromValue(qmlParent)),
Q_ARG(QVariant, QVariant::fromValue(menu->title())));
Q_ASSERT(invokeResult);
Q_UNUSED(invokeResult); // FIXME - apparently we haven't upgraded the Qt on our unix Jenkins environments to 5.5.x
QObject* result = returnedValue.value<QObject*>();
Q_ASSERT(result);
@ -153,6 +154,7 @@ void VrMenu::addAction(QMenu* menu, QAction* action) {
Q_ARG(QVariant, QVariant::fromValue(menuQml)),
Q_ARG(QVariant, QVariant::fromValue(action->text())));
Q_ASSERT(invokeResult);
Q_UNUSED(invokeResult); // FIXME - apparently we haven't upgraded the Qt on our unix Jenkins environments to 5.5.x
QObject* result = returnedValue.value<QObject*>();
Q_ASSERT(result);
// Bind the QML and Widget together
@ -174,6 +176,7 @@ void VrMenu::insertAction(QAction* before, QAction* action) {
Q_ARG(QVariant, QVariant::fromValue(beforeQml)),
Q_ARG(QVariant, QVariant::fromValue(action->text())));
Q_ASSERT(invokeResult);
Q_UNUSED(invokeResult); // FIXME - apparently we haven't upgraded the Qt on our unix Jenkins environments to 5.5.x
QObject* result = returnedValue.value<QObject*>();
Q_ASSERT(result);
bindActionToQmlAction(result, action);
@ -192,4 +195,5 @@ void VrMenu::removeAction(QAction* action) {
Q_ARG(QVariant, QVariant::fromValue(menu)),
Q_ARG(QVariant, QVariant::fromValue(item)));
Q_ASSERT(invokeResult);
Q_UNUSED(invokeResult); // FIXME - apparently we haven't upgraded the Qt on our unix Jenkins environments to 5.5.x
}