From c319962d6eb7ba6b38b4d093665ea3ad20d11549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 7 Dec 2012 20:50:48 +0100 Subject: [PATCH] Adapted to Corrade changes. --- src/Math/Algorithms/Test/CMakeLists.txt | 2 +- src/Math/Geometry/Test/CMakeLists.txt | 4 ++-- src/Math/Test/CMakeLists.txt | 26 ++++++++++++------------- src/MeshTools/Test/CMakeLists.txt | 16 +++++++-------- src/Physics/Test/CMakeLists.txt | 20 +++++++++---------- src/Primitives/Test/CMakeLists.txt | 6 +++--- src/SceneGraph/Test/CMakeLists.txt | 6 +++--- src/Test/CMakeLists.txt | 12 ++++++------ 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/Math/Algorithms/Test/CMakeLists.txt b/src/Math/Algorithms/Test/CMakeLists.txt index 41e1779f2..88eb779c5 100644 --- a/src/Math/Algorithms/Test/CMakeLists.txt +++ b/src/Math/Algorithms/Test/CMakeLists.txt @@ -1 +1 @@ -corrade_add_test2(MathAlgorithmsGaussJordanTest GaussJordanTest.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathAlgorithmsGaussJordanTest GaussJordanTest.cpp LIBRARIES MagnumMathTestLib) diff --git a/src/Math/Geometry/Test/CMakeLists.txt b/src/Math/Geometry/Test/CMakeLists.txt index eb7810334..7d6dcfa93 100644 --- a/src/Math/Geometry/Test/CMakeLists.txt +++ b/src/Math/Geometry/Test/CMakeLists.txt @@ -1,2 +1,2 @@ -corrade_add_test2(MathGeometryDistanceTest DistanceTest.cpp) -corrade_add_test2(MathGeometryIntersectionTest IntersectionTest.cpp) +corrade_add_test(MathGeometryDistanceTest DistanceTest.cpp) +corrade_add_test(MathGeometryIntersectionTest IntersectionTest.cpp) diff --git a/src/Math/Test/CMakeLists.txt b/src/Math/Test/CMakeLists.txt index c641a04a5..ad6385d3f 100644 --- a/src/Math/Test/CMakeLists.txt +++ b/src/Math/Test/CMakeLists.txt @@ -1,19 +1,19 @@ -corrade_add_test2(MathConstantsTest ConstantsTest.cpp) -corrade_add_test2(MathTest MathTest.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MathMathTypeTraitsTest MathTypeTraitsTest.cpp) +corrade_add_test(MathConstantsTest ConstantsTest.cpp) +corrade_add_test(MathTest MathTest.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathMathTypeTraitsTest MathTypeTraitsTest.cpp) -corrade_add_test2(MathRectangularMatrixTest RectangularMatrixTest.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathRectangularMatrixTest RectangularMatrixTest.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MathVectorTest VectorTest.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MathVector2Test Vector2Test.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MathVector3Test Vector3Test.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MathVector4Test Vector4Test.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathVectorTest VectorTest.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathVector2Test Vector2Test.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathVector3Test Vector3Test.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathVector4Test Vector4Test.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MathPoint2DTest Point2DTest.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MathPoint3DTest Point3DTest.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathPoint2DTest Point2DTest.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathPoint3DTest Point3DTest.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MathMatrixTest MatrixTest.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MathMatrix3Test Matrix3Test.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MathMatrix4Test Matrix4Test.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathMatrixTest MatrixTest.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathMatrix3Test Matrix3Test.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MathMatrix4Test Matrix4Test.cpp LIBRARIES MagnumMathTestLib) set_target_properties(MathVectorTest MathMatrix4Test PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT) diff --git a/src/MeshTools/Test/CMakeLists.txt b/src/MeshTools/Test/CMakeLists.txt index 0a4608faf..e98374b66 100644 --- a/src/MeshTools/Test/CMakeLists.txt +++ b/src/MeshTools/Test/CMakeLists.txt @@ -1,12 +1,12 @@ -corrade_add_test2(MeshToolsCleanTest CleanTest.cpp) -corrade_add_test2(MeshToolsCombineIndexedArraysTest CombineIndexedArraysTest.cpp) -corrade_add_test2(MeshToolsCompressIndicesTest CompressIndicesTest.cpp LIBRARIES MagnumMeshTools) -corrade_add_test2(MeshToolsFlipNormalsTest FlipNormalsTest.cpp LIBRARIES MagnumMeshToolsTestLib) -corrade_add_test2(MeshToolsGenerateFlatNormalsTest GenerateFlatNormalsTest.cpp LIBRARIES MagnumMeshToolsTestLib) -corrade_add_test2(MeshToolsInterleaveTest InterleaveTest.cpp) -corrade_add_test2(MeshToolsSubdivideTest SubdivideTest.cpp) +corrade_add_test(MeshToolsCleanTest CleanTest.cpp) +corrade_add_test(MeshToolsCombineIndexedArraysTest CombineIndexedArraysTest.cpp) +corrade_add_test(MeshToolsCompressIndicesTest CompressIndicesTest.cpp LIBRARIES MagnumMeshTools) +corrade_add_test(MeshToolsFlipNormalsTest FlipNormalsTest.cpp LIBRARIES MagnumMeshToolsTestLib) +corrade_add_test(MeshToolsGenerateFlatNormalsTest GenerateFlatNormalsTest.cpp LIBRARIES MagnumMeshToolsTestLib) +corrade_add_test(MeshToolsInterleaveTest InterleaveTest.cpp) +corrade_add_test(MeshToolsSubdivideTest SubdivideTest.cpp) # corrade_add_test(MeshToolsSubdivideCleanBenchmark SubdivideCleanBenchmark.h SubdivideCleanBenchmark.cpp MagnumPrimitives) -corrade_add_test2(MeshToolsTipsifyTest TipsifyTest.cpp LIBRARIES MagnumMeshTools) +corrade_add_test(MeshToolsTipsifyTest TipsifyTest.cpp LIBRARIES MagnumMeshTools) # Graceful assert for testing set_target_properties(MeshToolsCombineIndexedArraysTest MeshToolsInterleaveTest MeshToolsSubdivideTest PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT) diff --git a/src/Physics/Test/CMakeLists.txt b/src/Physics/Test/CMakeLists.txt index 5c6c5f2a5..4477fdda6 100644 --- a/src/Physics/Test/CMakeLists.txt +++ b/src/Physics/Test/CMakeLists.txt @@ -1,11 +1,11 @@ -corrade_add_test2(PhysicsAbstractShapeTest AbstractShapeTest.cpp LIBRARIES MagnumPhysics) -corrade_add_test2(PhysicsAxisAlignedBoxTest AxisAlignedBoxTest.cpp LIBRARIES MagnumPhysics) -corrade_add_test2(PhysicsBoxTest BoxTest.cpp LIBRARIES MagnumPhysics) -corrade_add_test2(PhysicsCapsuleTest CapsuleTest.cpp LIBRARIES MagnumPhysics) -corrade_add_test2(PhysicsLineTest LineTest.cpp LIBRARIES MagnumPhysics) -corrade_add_test2(PhysicsPlaneTest PlaneTest.cpp LIBRARIES MagnumPhysics) -corrade_add_test2(PhysicsPointTest PointTest.cpp LIBRARIES MagnumPhysics) -corrade_add_test2(PhysicsShapeGroupTest ShapeGroupTest.cpp LIBRARIES MagnumPhysics) -corrade_add_test2(PhysicsSphereTest SphereTest.cpp LIBRARIES MagnumPhysics) +corrade_add_test(PhysicsAbstractShapeTest AbstractShapeTest.cpp LIBRARIES MagnumPhysics) +corrade_add_test(PhysicsAxisAlignedBoxTest AxisAlignedBoxTest.cpp LIBRARIES MagnumPhysics) +corrade_add_test(PhysicsBoxTest BoxTest.cpp LIBRARIES MagnumPhysics) +corrade_add_test(PhysicsCapsuleTest CapsuleTest.cpp LIBRARIES MagnumPhysics) +corrade_add_test(PhysicsLineTest LineTest.cpp LIBRARIES MagnumPhysics) +corrade_add_test(PhysicsPlaneTest PlaneTest.cpp LIBRARIES MagnumPhysics) +corrade_add_test(PhysicsPointTest PointTest.cpp LIBRARIES MagnumPhysics) +corrade_add_test(PhysicsShapeGroupTest ShapeGroupTest.cpp LIBRARIES MagnumPhysics) +corrade_add_test(PhysicsSphereTest SphereTest.cpp LIBRARIES MagnumPhysics) -corrade_add_test2(PhysicsObjectShapeTest ObjectShapeTest.cpp LIBRARIES MagnumPhysics) +corrade_add_test(PhysicsObjectShapeTest ObjectShapeTest.cpp LIBRARIES MagnumPhysics) diff --git a/src/Primitives/Test/CMakeLists.txt b/src/Primitives/Test/CMakeLists.txt index c8374ccd0..cf9d61c75 100644 --- a/src/Primitives/Test/CMakeLists.txt +++ b/src/Primitives/Test/CMakeLists.txt @@ -1,3 +1,3 @@ -corrade_add_test2(PrimitivesCapsuleTest CapsuleTest.cpp LIBRARIES MagnumPrimitives) -corrade_add_test2(PrimitivesUVSphereTest UVSphereTest.cpp LIBRARIES MagnumPrimitives) -corrade_add_test2(PrimitivesCylinderTest CylinderTest.cpp LIBRARIES MagnumPrimitives) +corrade_add_test(PrimitivesCapsuleTest CapsuleTest.cpp LIBRARIES MagnumPrimitives) +corrade_add_test(PrimitivesUVSphereTest UVSphereTest.cpp LIBRARIES MagnumPrimitives) +corrade_add_test(PrimitivesCylinderTest CylinderTest.cpp LIBRARIES MagnumPrimitives) diff --git a/src/SceneGraph/Test/CMakeLists.txt b/src/SceneGraph/Test/CMakeLists.txt index e0db0910d..eef3c02cb 100644 --- a/src/SceneGraph/Test/CMakeLists.txt +++ b/src/SceneGraph/Test/CMakeLists.txt @@ -1,3 +1,3 @@ -corrade_add_test2(SceneGraphObjectTest ObjectTest.cpp LIBRARIES MagnumSceneGraphTestLib) -corrade_add_test2(SceneGraphCameraTest CameraTest.cpp LIBRARIES MagnumSceneGraph) -corrade_add_test2(SceneGraphSceneTest SceneTest.cpp LIBRARIES MagnumSceneGraph) +corrade_add_test(SceneGraphObjectTest ObjectTest.cpp LIBRARIES MagnumSceneGraphTestLib) +corrade_add_test(SceneGraphCameraTest CameraTest.cpp LIBRARIES MagnumSceneGraph) +corrade_add_test(SceneGraphSceneTest SceneTest.cpp LIBRARIES MagnumSceneGraph) diff --git a/src/Test/CMakeLists.txt b/src/Test/CMakeLists.txt index 68ebd975e..743268bed 100644 --- a/src/Test/CMakeLists.txt +++ b/src/Test/CMakeLists.txt @@ -1,8 +1,8 @@ -corrade_add_test2(ArrayTest ArrayTest.cpp) -corrade_add_test2(ColorTest ColorTest.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(MeshTest MeshTest.cpp LIBRARIES Magnum) -corrade_add_test2(ResourceManagerTest ResourceManagerTest.cpp LIBRARIES MagnumTestLib) -corrade_add_test2(SwizzleTest SwizzleTest.cpp LIBRARIES MagnumMathTestLib) -corrade_add_test2(TypeTraitsTest TypeTraitsTest.cpp LIBRARIES Magnum) +corrade_add_test(ArrayTest ArrayTest.cpp) +corrade_add_test(ColorTest ColorTest.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(MeshTest MeshTest.cpp LIBRARIES Magnum) +corrade_add_test(ResourceManagerTest ResourceManagerTest.cpp LIBRARIES MagnumTestLib) +corrade_add_test(SwizzleTest SwizzleTest.cpp LIBRARIES MagnumMathTestLib) +corrade_add_test(TypeTraitsTest TypeTraitsTest.cpp LIBRARIES Magnum) set_target_properties(ResourceManagerTest PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT)