Magnum now depends on Corrade.

Corrade will provide necessary things like plugin management and many
other useful utilities.

CMakeLists.txt

@@ -3,6 +3,8 @@ project(Magnum)
 
 option(BUILD_TESTS "Build unit tests (requires Qt4)." OFF)
 
+find_package(Corrade REQUIRED)
+
 if(BUILD_TESTS)
     find_package(Qt4)
 
@@ -15,7 +17,6 @@ if(BUILD_TESTS)
 endif()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${Magnum_SOURCE_DIR}/modules/")
-include(MagnumMacros)
 
 set_parent_scope(MAGNUM_INCLUDE_DIR     "${CMAKE_CURRENT_SOURCE_DIR}/src")
 set_parent_scope(MAGNUM_LIBRARY         Magnum)

PKGBUILD

@@ -6,6 +6,7 @@ pkgdesc="OpenGL 3 graphics engine"
 arch=('i686' 'x86_64')
 url="http://mosra.cz/blog/"
 license=('LGPLv3')
+depends=('corrade')
 makedepends=('cmake' 'mesa' 'glew')
 optdepends=('qt')
 options=(!strip)

modules/CMakeLists.txt

@@ -1 +1 @@
-install(FILES FindMagnum.cmake MagnumMacros.cmake DESTINATION ${MAGNUM_CMAKE_MODULE_INSTALL_DIR})
+install(FILES FindMagnum.cmake DESTINATION ${MAGNUM_CMAKE_MODULE_INSTALL_DIR})

modules/FindMagnum.cmake

@@ -1,6 +1,6 @@
 # Find Magnum - Magnum handling module for CMake
 #
-# This module defines:
+# This module depends on Corrade and additionally defines:
 #
 # MAGNUM_FOUND          - True if Magnum library is found
 # MAGNUM_INCLUDE_DIR    - Include dir for Magnum
@@ -11,7 +11,7 @@
 # MAGNUM_INCLUDE_INSTALL_DIR        - Include installation directory for headers
 #
 
-include(MagnumMacros)
+find_package(Corrade REQUIRED)
 
 if (MAGNUM_INCLUDE_DIR AND MAGNUM_LIBRARY)
 

modules/MagnumMacros.cmake

@@ -1,21 +0,0 @@
-macro(set_parent_scope name)
-    set(${name} ${ARGN})
-
-    # Set to parent scope only if parent exists
-    if(NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
-        set(${name} ${${name}} PARENT_SCOPE)
-    endif()
-endmacro()
-
-if(QT4_FOUND)
-function(magnum_add_test test_name moc_header source_file)
-    foreach(library ${ARGN})
-        set(libraries ${library} ${libraries})
-    endforeach()
-
-    qt4_wrap_cpp(${test_name}_MOC ${moc_header})
-    add_executable(${test_name} ${source_file} ${${test_name}_MOC})
-    target_link_libraries(${test_name} ${libraries} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
-    add_test(${test_name} ${test_name})
-endfunction()
-endif()

src/CMakeLists.txt

@@ -18,7 +18,7 @@ set(Magnum_SRCS
 )
 
 add_library(Magnum SHARED ${Magnum_SRCS})
-target_link_libraries(Magnum ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARY})
+target_link_libraries(Magnum CorradePluginManager CorradeUtility ${OPENGL_gl_LIBRARY} ${GLEW_LIBRARY})
 
 install(TARGETS Magnum DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
 

src/Math/Test/CMakeLists.txt

@@ -1,8 +1,8 @@
-magnum_add_test(VectorTest VectorTest.h VectorTest.cpp)
+corrade_add_test(VectorTest VectorTest.h VectorTest.cpp)
-magnum_add_test(Vector3Test Vector3Test.h Vector3Test.cpp)
+corrade_add_test(Vector3Test Vector3Test.h Vector3Test.cpp)
-magnum_add_test(Vector4Test Vector4Test.h Vector4Test.cpp)
+corrade_add_test(Vector4Test Vector4Test.h Vector4Test.cpp)
 
-magnum_add_test(MatrixTest MatrixTest.h MatrixTest.cpp)
+corrade_add_test(MatrixTest MatrixTest.h MatrixTest.cpp)
-magnum_add_test(Matrix4Test Matrix4Test.h Matrix4Test.cpp)
+corrade_add_test(Matrix4Test Matrix4Test.h Matrix4Test.cpp)
 
-magnum_add_test(GeometryUtilsTest GeometryUtilsTest.h GeometryUtilsTest.cpp)
+corrade_add_test(GeometryUtilsTest GeometryUtilsTest.h GeometryUtilsTest.cpp)

src/Test/CMakeLists.txt

@@ -1,5 +1,5 @@
-magnum_add_test(ObjectTest ObjectTest.h ObjectTest.cpp Magnum)
+corrade_add_test(ObjectTest ObjectTest.h ObjectTest.cpp Magnum)
-magnum_add_test(CameraTest CameraTest.h CameraTest.cpp Magnum)
+corrade_add_test(CameraTest CameraTest.h CameraTest.cpp Magnum)
-magnum_add_test(SceneTest SceneTest.h SceneTest.cpp Magnum)
+corrade_add_test(SceneTest SceneTest.h SceneTest.cpp Magnum)
-magnum_add_test(MeshBuilderTest MeshBuilderTest.h MeshBuilderTest.cpp Magnum)
+corrade_add_test(MeshBuilderTest MeshBuilderTest.h MeshBuilderTest.cpp Magnum)
-magnum_add_test(MeshBuilderBenchmark MeshBuilderBenchmark.h MeshBuilderBenchmark.cpp Magnum)
+corrade_add_test(MeshBuilderBenchmark MeshBuilderBenchmark.h MeshBuilderBenchmark.cpp Magnum)