From 3619541f9e039bf71686c0dfee4abd225b6cb858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 2 Aug 2014 23:09:34 +0200 Subject: [PATCH] Minor cleanup. --- doc/platform.dox | 2 +- modules/FindMagnum.cmake | 4 ++-- src/Magnum/DebugTools/Test/ForceRendererTest.cpp | 2 +- src/Magnum/Platform/CMakeLists.txt | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/platform.dox b/doc/platform.dox index ef1cd319f..6323bc516 100644 --- a/doc/platform.dox +++ b/doc/platform.dox @@ -189,7 +189,7 @@ compilation of the executable and linking `${MAGNUM_LIBRARIES}` and `${MAGNUM_SDL2APPLICATION_LIBRARIES}` to it. Again, to simplify porting, you can also use generic `${MAGNUM_APPLICATION_INCLUDE_DIRS}` -and `${MAGNUM_WAPPLICATION_LIBRARIES}` aliases (or `${MAGNUM_WINDOWLESSAPPLICATION_INCLUDE_DIRS}`, +and `${MAGNUM_APPLICATION_LIBRARIES}` aliases (or `${MAGNUM_WINDOWLESSAPPLICATION_INCLUDE_DIRS}`, `${MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES}` for windowless applications), but only if only one application (windowless application) component is requested to avoid ambiguity. Changing the build script to use different toolkit is then diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index cef0cfc98..4c2a4b769 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -456,8 +456,8 @@ foreach(component ${Magnum_FIND_COMPONENTS}) MAGNUM_${_COMPONENT}_LIBRARY _MAGNUM_${_COMPONENT}_INCLUDE_DIR) - # Global aliases for Windowless*Application and *Application components. - # If already set, unset them to avoid ambiguity. + # Global aliases for Windowless*Application and *Application + # components. If already set, unset them to avoid ambiguity. if(${component} MATCHES Windowless.+Application) if(NOT DEFINED MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES AND NOT DEFINED MAGNUM_WINDOWLESSAPPLICATION_INCLUDE_DIRS) set(MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES ${MAGNUM_${_COMPONENT}_LIBRARIES}) diff --git a/src/Magnum/DebugTools/Test/ForceRendererTest.cpp b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp index 63cc8a02e..7b0f0a5e2 100644 --- a/src/Magnum/DebugTools/Test/ForceRendererTest.cpp +++ b/src/Magnum/DebugTools/Test/ForceRendererTest.cpp @@ -103,7 +103,7 @@ void ForceRendererTest::arbitrary3D() { CORRADE_COMPARE(Vector3::dot(m.right(), m.up()), 0.0f); CORRADE_COMPARE(Vector3::dot(m.right(), m.backward()), 0.0f); /** @todo This shouldn't be too different */ - CORRADE_VERIFY(Math::abs(Vector3::dot(m.up(), m.backward())) < Math::TypeTraits::epsilon()); + CORRADE_VERIFY(Math::abs(Vector3::dot(m.up(), m.backward())) < Math::TypeTraits::epsilon()); } }}}} diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt index 7001bd717..94c68ceec 100644 --- a/src/Magnum/Platform/CMakeLists.txt +++ b/src/Magnum/Platform/CMakeLists.txt @@ -170,7 +170,7 @@ endif() # GLX application if(WITH_GLXAPPLICATION) set(NEED_ABSTRACTXAPPLICATION 1) - set(NEED_GLXCONTEXT 1) + set(NEED_GLXCONTEXTHANDLER 1) set(MagnumGlxApplication_SRCS $ @@ -192,7 +192,7 @@ endif() # X/EGL application if(WITH_XEGLAPPLICATION) set(NEED_ABSTRACTXAPPLICATION 1) - set(NEED_EGLCONTEXT 1) + set(NEED_EGLCONTEXTHANDLER 1) set(MagnumXEglApplication_SRCS $ @@ -288,7 +288,7 @@ if(NEED_ABSTRACTXAPPLICATION) endif() # GLX context -if(NEED_GLXCONTEXT) +if(NEED_GLXCONTEXTHANDLER) set(MagnumGlxContextHandler_SRCS Implementation/GlxContextHandler.cpp) set(MagnumGlxContextHandler_PRIVATE_HEADERS @@ -303,7 +303,7 @@ if(NEED_GLXCONTEXT) endif() # EGL context -if(NEED_EGLCONTEXT) +if(NEED_EGLCONTEXTHANDLER) find_package(EGL) if(NOT EGL_FOUND) message(FATAL_ERROR "EGL library, required by some window contexts, was not found. Set WITH_*EGL*APPLICATION to OFF to skip building them.")