Browse Source

Minor cleanup.

pull/68/head
Vladimír Vondruš 12 years ago
parent
commit
3619541f9e
  1. 2
      doc/platform.dox
  2. 4
      modules/FindMagnum.cmake
  3. 2
      src/Magnum/DebugTools/Test/ForceRendererTest.cpp
  4. 8
      src/Magnum/Platform/CMakeLists.txt

2
doc/platform.dox

@ -189,7 +189,7 @@ compilation of the executable and linking `${MAGNUM_LIBRARIES}` and
`${MAGNUM_SDL2APPLICATION_LIBRARIES}` to it. `${MAGNUM_SDL2APPLICATION_LIBRARIES}` to it.
Again, to simplify porting, you can also use generic `${MAGNUM_APPLICATION_INCLUDE_DIRS}` 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 `${MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES}` for windowless applications), but
only if only one application (windowless application) component is requested to only if only one application (windowless application) component is requested to
avoid ambiguity. Changing the build script to use different toolkit is then avoid ambiguity. Changing the build script to use different toolkit is then

4
modules/FindMagnum.cmake

@ -456,8 +456,8 @@ foreach(component ${Magnum_FIND_COMPONENTS})
MAGNUM_${_COMPONENT}_LIBRARY MAGNUM_${_COMPONENT}_LIBRARY
_MAGNUM_${_COMPONENT}_INCLUDE_DIR) _MAGNUM_${_COMPONENT}_INCLUDE_DIR)
# Global aliases for Windowless*Application and *Application components. # Global aliases for Windowless*Application and *Application
# If already set, unset them to avoid ambiguity. # components. If already set, unset them to avoid ambiguity.
if(${component} MATCHES Windowless.+Application) if(${component} MATCHES Windowless.+Application)
if(NOT DEFINED MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES AND NOT DEFINED MAGNUM_WINDOWLESSAPPLICATION_INCLUDE_DIRS) if(NOT DEFINED MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES AND NOT DEFINED MAGNUM_WINDOWLESSAPPLICATION_INCLUDE_DIRS)
set(MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES ${MAGNUM_${_COMPONENT}_LIBRARIES}) set(MAGNUM_WINDOWLESSAPPLICATION_LIBRARIES ${MAGNUM_${_COMPONENT}_LIBRARIES})

2
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.up()), 0.0f);
CORRADE_COMPARE(Vector3::dot(m.right(), m.backward()), 0.0f); CORRADE_COMPARE(Vector3::dot(m.right(), m.backward()), 0.0f);
/** @todo This shouldn't be too different */ /** @todo This shouldn't be too different */
CORRADE_VERIFY(Math::abs(Vector3::dot(m.up(), m.backward())) < Math::TypeTraits<Float>::epsilon()); CORRADE_VERIFY(Math::abs(Vector3::dot(m.up(), m.backward())) < Math::TypeTraits<Float>::epsilon());
} }
}}}} }}}}

8
src/Magnum/Platform/CMakeLists.txt

@ -170,7 +170,7 @@ endif()
# GLX application # GLX application
if(WITH_GLXAPPLICATION) if(WITH_GLXAPPLICATION)
set(NEED_ABSTRACTXAPPLICATION 1) set(NEED_ABSTRACTXAPPLICATION 1)
set(NEED_GLXCONTEXT 1) set(NEED_GLXCONTEXTHANDLER 1)
set(MagnumGlxApplication_SRCS set(MagnumGlxApplication_SRCS
$<TARGET_OBJECTS:MagnumAbstractXApplication> $<TARGET_OBJECTS:MagnumAbstractXApplication>
@ -192,7 +192,7 @@ endif()
# X/EGL application # X/EGL application
if(WITH_XEGLAPPLICATION) if(WITH_XEGLAPPLICATION)
set(NEED_ABSTRACTXAPPLICATION 1) set(NEED_ABSTRACTXAPPLICATION 1)
set(NEED_EGLCONTEXT 1) set(NEED_EGLCONTEXTHANDLER 1)
set(MagnumXEglApplication_SRCS set(MagnumXEglApplication_SRCS
$<TARGET_OBJECTS:MagnumAbstractXApplication> $<TARGET_OBJECTS:MagnumAbstractXApplication>
@ -288,7 +288,7 @@ if(NEED_ABSTRACTXAPPLICATION)
endif() endif()
# GLX context # GLX context
if(NEED_GLXCONTEXT) if(NEED_GLXCONTEXTHANDLER)
set(MagnumGlxContextHandler_SRCS set(MagnumGlxContextHandler_SRCS
Implementation/GlxContextHandler.cpp) Implementation/GlxContextHandler.cpp)
set(MagnumGlxContextHandler_PRIVATE_HEADERS set(MagnumGlxContextHandler_PRIVATE_HEADERS
@ -303,7 +303,7 @@ if(NEED_GLXCONTEXT)
endif() endif()
# EGL context # EGL context
if(NEED_EGLCONTEXT) if(NEED_EGLCONTEXTHANDLER)
find_package(EGL) find_package(EGL)
if(NOT EGL_FOUND) 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.") message(FATAL_ERROR "EGL library, required by some window contexts, was not found. Set WITH_*EGL*APPLICATION to OFF to skip building them.")

Loading…
Cancel
Save