From 12fa6961c894d3d8586065c713f210f0d384bfd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 8 Apr 2017 14:33:08 +0200 Subject: [PATCH] Use CMake folders also for OBJECT libraries, executables and tests. --- doc/snippets/CMakeLists.txt | 1 + src/Magnum/Audio/CMakeLists.txt | 2 + src/Magnum/Audio/Test/CMakeLists.txt | 20 +++++ src/Magnum/CMakeLists.txt | 5 +- src/Magnum/DebugTools/Test/CMakeLists.txt | 13 ++++ src/Magnum/Math/Algorithms/CMakeLists.txt | 1 + .../Math/Algorithms/Test/CMakeLists.txt | 8 ++ src/Magnum/Math/CMakeLists.txt | 1 + src/Magnum/Math/Geometry/CMakeLists.txt | 1 + src/Magnum/Math/Geometry/Test/CMakeLists.txt | 7 +- src/Magnum/Math/Test/CMakeLists.txt | 35 +++++++++ src/Magnum/MeshTools/CMakeLists.txt | 5 +- src/Magnum/MeshTools/Test/CMakeLists.txt | 14 ++++ src/Magnum/Platform/CMakeLists.txt | 12 ++- src/Magnum/Primitives/Test/CMakeLists.txt | 8 ++ src/Magnum/SceneGraph/CMakeLists.txt | 5 +- src/Magnum/SceneGraph/Test/CMakeLists.txt | 16 +++- src/Magnum/Shaders/CMakeLists.txt | 1 + src/Magnum/Shaders/Test/CMakeLists.txt | 18 +++++ src/Magnum/Shapes/Test/CMakeLists.txt | 15 ++++ src/Magnum/Test/CMakeLists.txt | 78 +++++++++++++++++++ src/Magnum/Text/CMakeLists.txt | 1 + src/Magnum/Text/Test/CMakeLists.txt | 11 +++ src/Magnum/TextureTools/CMakeLists.txt | 2 + src/Magnum/TextureTools/Test/CMakeLists.txt | 1 + src/Magnum/Trade/CMakeLists.txt | 2 + src/Magnum/Trade/Test/CMakeLists.txt | 15 ++++ src/MagnumExternal/OpenGL/GL/CMakeLists.txt | 2 +- .../OpenGL/GLES2/CMakeLists.txt | 2 +- .../OpenGL/GLES3/CMakeLists.txt | 2 +- 30 files changed, 294 insertions(+), 10 deletions(-) diff --git a/doc/snippets/CMakeLists.txt b/doc/snippets/CMakeLists.txt index 7e76c810e..3ff976101 100644 --- a/doc/snippets/CMakeLists.txt +++ b/doc/snippets/CMakeLists.txt @@ -38,4 +38,5 @@ if(WITH_DEBUGTOOLS AND Corrade_TestSuite_FOUND AND NOT CORRADE_TARGET_IOS) add_executable(debugtools-compareimage debugtools-compareimage.cpp) target_link_libraries(debugtools-compareimage PRIVATE MagnumDebugTools) target_include_directories(debugtools-compareimage PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + set_target_properties(debugtools-compareimage PROPERTIES FOLDER "Magnum/doc/snippets") endif() diff --git a/src/Magnum/Audio/CMakeLists.txt b/src/Magnum/Audio/CMakeLists.txt index d24ef9d81..219021fcd 100644 --- a/src/Magnum/Audio/CMakeLists.txt +++ b/src/Magnum/Audio/CMakeLists.txt @@ -82,6 +82,8 @@ add_library(Magnum::Audio ALIAS MagnumAudio) if(WITH_AL_INFO) add_executable(magnum-al-info magnum-al-info.cpp) target_link_libraries(magnum-al-info MagnumAudio) + set_target_properties(magnum-al-info PROPERTIES FOLDER "Magnum/Audio") + install(TARGETS magnum-al-info DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}) if(CORRADE_TARGET_IOS) diff --git a/src/Magnum/Audio/Test/CMakeLists.txt b/src/Magnum/Audio/Test/CMakeLists.txt index 53d4accf5..15d5a5911 100644 --- a/src/Magnum/Audio/Test/CMakeLists.txt +++ b/src/Magnum/Audio/Test/CMakeLists.txt @@ -42,14 +42,34 @@ corrade_add_test(AudioContextTest ContextTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioRendererTest RendererTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioSourceTest SourceTest.cpp LIBRARIES MagnumAudio) +set_target_properties( + AudioAbstractImporterTest + AudioBufferTest + AudioContextTest + AudioRendererTest + AudioSourceTest + PROPERTIES FOLDER "Magnum/Audio/Test") + if(BUILD_AL_TESTS) corrade_add_test(AudioBufferALTest BufferALTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioContextALTest ContextALTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioRendererALTest RendererALTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioSourceALTest SourceALTest.cpp LIBRARIES MagnumAudio) + set_target_properties( + AudioBufferALTest + AudioContextALTest + AudioRendererALTest + AudioSourceALTest + PROPERTIES FOLDER "Magnum/Audio/Test") + if(WITH_SCENEGRAPH) corrade_add_test(AudioListenerALTest ListenerALTest.cpp LIBRARIES MagnumSceneGraph MagnumAudio) corrade_add_test(AudioPlayableALTest PlayableALTest.cpp LIBRARIES MagnumSceneGraph MagnumAudio) endif() + + set_target_properties( + AudioListenerALTest + AudioPlayableALTest + PROPERTIES FOLDER "Magnum/Audio/Test") endif() diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt index f0a86245b..8d9105546 100644 --- a/src/Magnum/CMakeLists.txt +++ b/src/Magnum/CMakeLists.txt @@ -239,6 +239,7 @@ endif() if(NOT BUILD_STATIC OR BUILD_STATIC_PIC) set_target_properties(MagnumMathObjects PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() +set_target_properties(MagnumMathObjects PROPERTIES FOLDER "Magnum/Math") # Main library add_library(Magnum ${SHARED_OR_STATIC} @@ -363,7 +364,9 @@ if(BUILD_TESTS) ${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details target_include_directories(MagnumMathTestLib PUBLIC $) target_compile_definitions(MagnumMathTestLib PRIVATE "CORRADE_GRACEFUL_ASSERT") - set_target_properties(MagnumMathTestLib PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumMathTestLib PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Math") target_link_libraries(MagnumMathTestLib Corrade::Utility) # On Windows we need to install first and then run the tests to avoid "DLL diff --git a/src/Magnum/DebugTools/Test/CMakeLists.txt b/src/Magnum/DebugTools/Test/CMakeLists.txt index d742dd6f7..9a9f59eae 100644 --- a/src/Magnum/DebugTools/Test/CMakeLists.txt +++ b/src/Magnum/DebugTools/Test/CMakeLists.txt @@ -27,17 +27,30 @@ if(WITH_SHAPES) corrade_add_test(DebugToolsCapsuleRendererTest CapsuleRendererTest.cpp LIBRARIES MagnumMathTestLib) corrade_add_test(DebugToolsCylinderRendererTest CylinderRendererTest.cpp LIBRARIES MagnumMathTestLib) corrade_add_test(DebugToolsLineSegmentRendererTest LineSegmentRendererTest.cpp LIBRARIES MagnumMathTestLib) + + set_target_properties( + DebugToolsCapsuleRendererTest + DebugToolsCylinderRendererTest + DebugToolsLineSegmentRendererTest + PROPERTIES FOLDER "Magnum/DebugTools/Test") endif() if(WITH_SCENEGRAPH) corrade_add_test(DebugToolsForceRendererTest ForceRendererTest.cpp LIBRARIES MagnumMathTestLib) + set_target_properties(DebugToolsForceRendererTest PROPERTIES FOLDER "Magnum/DebugTools/Test") endif() if(Corrade_TestSuite_FOUND) corrade_add_test(DebugToolsCompareImageTest CompareImageTest.cpp LIBRARIES MagnumDebugTools) + set_target_properties(DebugToolsCompareImageTest PROPERTIES FOLDER "Magnum/DebugTools/Test") endif() if(BUILD_GL_TESTS) corrade_add_test(DebugToolsBufferDataGLTest BufferDataGLTest.cpp LIBRARIES MagnumDebugTools MagnumOpenGLTester) corrade_add_test(DebugToolsTextureImageGLTest TextureImageGLTest.cpp LIBRARIES MagnumDebugTools MagnumOpenGLTester) + + set_target_properties( + DebugToolsBufferDataGLTest + DebugToolsTextureImageGLTest + PROPERTIES FOLDER "Magnum/DebugTools/Test") endif() diff --git a/src/Magnum/Math/Algorithms/CMakeLists.txt b/src/Magnum/Math/Algorithms/CMakeLists.txt index 2eb2cdbf9..e8b879c23 100644 --- a/src/Magnum/Math/Algorithms/CMakeLists.txt +++ b/src/Magnum/Math/Algorithms/CMakeLists.txt @@ -32,6 +32,7 @@ set(MagnumMathAlgorithms_HEADERS # Force IDEs to display all header files in project view add_custom_target(MagnumMathAlgorithms SOURCES ${MagnumMathAlgorithms_HEADERS}) +set_target_properties(MagnumMathAlgorithms PROPERTIES FOLDER "Magnum/Math/Algorithms") install(FILES ${MagnumMathAlgorithms_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Math/Algorithms) diff --git a/src/Magnum/Math/Algorithms/Test/CMakeLists.txt b/src/Magnum/Math/Algorithms/Test/CMakeLists.txt index e992fbf4c..d907a7789 100644 --- a/src/Magnum/Math/Algorithms/Test/CMakeLists.txt +++ b/src/Magnum/Math/Algorithms/Test/CMakeLists.txt @@ -28,3 +28,11 @@ corrade_add_test(MathAlgorithmsGramSchmidtTest GramSchmidtTest.cpp LIBRARIES Mag corrade_add_test(MathAlgorithmsKahanSumTest KahanSumTest.cpp LIBRARIES MagnumMathTestLib) corrade_add_test(MathAlgorithmsQrTest QrTest.cpp LIBRARIES MagnumMathTestLib) corrade_add_test(MathAlgorithmsSvdTest SvdTest.cpp LIBRARIES MagnumMathTestLib) + +set_target_properties( + MathAlgorithmsGaussJordanTest + MathAlgorithmsGramSchmidtTest + MathAlgorithmsKahanSumTest + MathAlgorithmsQrTest + MathAlgorithmsSvdTest + PROPERTIES FOLDER "Magnum/Math/Algorithms/Test") diff --git a/src/Magnum/Math/CMakeLists.txt b/src/Magnum/Math/CMakeLists.txt index 6238e27f4..159aa1cf8 100644 --- a/src/Magnum/Math/CMakeLists.txt +++ b/src/Magnum/Math/CMakeLists.txt @@ -55,6 +55,7 @@ set(MagnumMath_HEADERS # Force IDEs to display all header files in project view add_custom_target(MagnumMath SOURCES ${MagnumMath_HEADERS}) +set_target_properties(MagnumMath PROPERTIES FOLDER "Magnum/Math") install(FILES ${MagnumMath_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Math) diff --git a/src/Magnum/Math/Geometry/CMakeLists.txt b/src/Magnum/Math/Geometry/CMakeLists.txt index 5d8a48fdb..067a96b08 100644 --- a/src/Magnum/Math/Geometry/CMakeLists.txt +++ b/src/Magnum/Math/Geometry/CMakeLists.txt @@ -29,6 +29,7 @@ set(MagnumMathGeometry_HEADERS # Force IDEs to display all header files in project view add_custom_target(MagnumMathGeometry SOURCES ${MagnumMathGeometry_HEADERS}) +set_target_properties(MagnumMathGeometry PROPERTIES FOLDER "Magnum/Math/Geometry") install(FILES ${MagnumMathGeometry_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Math/Geometry) diff --git a/src/Magnum/Math/Geometry/Test/CMakeLists.txt b/src/Magnum/Math/Geometry/Test/CMakeLists.txt index 6f10d0dc2..fada5ae1c 100644 --- a/src/Magnum/Math/Geometry/Test/CMakeLists.txt +++ b/src/Magnum/Math/Geometry/Test/CMakeLists.txt @@ -24,8 +24,11 @@ # corrade_add_test(MathGeometryDistanceTest DistanceTest.cpp LIBRARIES MagnumMathTestLib) +target_compile_definitions(MathGeometryDistanceTest PRIVATE "CORRADE_GRACEFUL_ASSERT") + corrade_add_test(MathGeometryIntersectionTest IntersectionTest.cpp LIBRARIES MagnumMathTestLib) -set_property(TARGET +set_target_properties( MathGeometryDistanceTest - APPEND PROPERTY COMPILE_DEFINITIONS "CORRADE_GRACEFUL_ASSERT") + MathGeometryIntersectionTest + PROPERTIES FOLDER "Magnum/Math/Geometry/Test") diff --git a/src/Magnum/Math/Test/CMakeLists.txt b/src/Magnum/Math/Test/CMakeLists.txt index d8ac76390..cfd4d30e7 100644 --- a/src/Magnum/Math/Test/CMakeLists.txt +++ b/src/Magnum/Math/Test/CMakeLists.txt @@ -66,3 +66,38 @@ set_property(TARGET MathQuaternionTest MathDualQuaternionTest APPEND PROPERTY COMPILE_DEFINITIONS "CORRADE_GRACEFUL_ASSERT") + +set_target_properties( + MathBoolVectorTest + MathConstantsTest + MathFunctionsTest + MathHalfTest + MathPackingTest + MathTagsTest + MathTypeTraitsTest + + MathVectorTest + MathVector2Test + MathVector3Test + MathVector4Test + MathColorTest + + MathRectangularMatrixTest + MathMatrixTest + MathMatrix3Test + MathMatrix4Test + + MathSwizzleTest + MathUnitTest + MathAngleTest + MathRangeTest + + MathDualTest + MathComplexTest + MathDualComplexTest + MathQuaternionTest + MathDualQuaternionTest + + MathBezierTest + MathFrustumTest + PROPERTIES FOLDER "Magnum/Math/Test") diff --git a/src/Magnum/MeshTools/CMakeLists.txt b/src/Magnum/MeshTools/CMakeLists.txt index 24758a29f..044251fad 100644 --- a/src/Magnum/MeshTools/CMakeLists.txt +++ b/src/Magnum/MeshTools/CMakeLists.txt @@ -63,6 +63,7 @@ endif() if(NOT BUILD_STATIC OR BUILD_STATIC_PIC) set_target_properties(MagnumMeshToolsObjects PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() +set_target_properties(MagnumMeshToolsObjects PROPERTIES FOLDER "Magnum/MeshTools") # Main MeshTools library add_library(MagnumMeshTools ${SHARED_OR_STATIC} @@ -87,7 +88,9 @@ if(BUILD_TESTS) add_library(MagnumMeshToolsTestLib ${SHARED_OR_STATIC} $ ${MagnumMeshTools_GracefulAssert_SRCS}) - set_target_properties(MagnumMeshToolsTestLib PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumMeshToolsTestLib PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/MeshTools") target_compile_definitions(MagnumMeshToolsTestLib PRIVATE "CORRADE_GRACEFUL_ASSERT" "MagnumMeshTools_EXPORTS") if(BUILD_STATIC_PIC) diff --git a/src/Magnum/MeshTools/Test/CMakeLists.txt b/src/Magnum/MeshTools/Test/CMakeLists.txt index 4c4174ead..be4de4203 100644 --- a/src/Magnum/MeshTools/Test/CMakeLists.txt +++ b/src/Magnum/MeshTools/Test/CMakeLists.txt @@ -41,3 +41,17 @@ set_property(TARGET MeshToolsInterleaveTest MeshToolsSubdivideTest APPEND PROPERTY COMPILE_DEFINITIONS "CORRADE_GRACEFUL_ASSERT") + +set_target_properties( + MeshToolsCombineIndexedArraysTest + MeshToolsCompressIndicesTest + MeshToolsDuplicateTest + MeshToolsFlipNormalsTest + MeshToolsGenerateFlatNormalsTest + MeshToolsInterleaveTest + MeshToolsRemoveDuplicatesTest + MeshToolsSubdivideTest + MeshToolsSubdivideRemov___Benchmark + MeshToolsTipsifyTest + MeshToolsTransformTest + PROPERTIES FOLDER "Magnum/MeshTools/Test") diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt index 76b22a641..4828bf280 100644 --- a/src/Magnum/Platform/CMakeLists.txt +++ b/src/Magnum/Platform/CMakeLists.txt @@ -72,7 +72,9 @@ if(WITH_ANDROIDAPPLICATION) add_library(MagnumAndroidApplicationGlue OBJECT ${ANDROID_NATIVE_APP_GLUE_SRC}) - set_target_properties(MagnumAndroidApplicationGlue PROPERTIES CORRADE_USE_PEDANTIC_FLAGS OFF) + set_target_properties(MagnumAndroidApplicationGlue PROPERTIES + CORRADE_USE_PEDANTIC_FLAGS OFF + FOLDER "Magnum/Platform") # They just don't care, so of course the ANativeActivity_onCreate() # function is not exported and thus the app startup fails if I don't # disable hidden visibility for the file. @@ -565,6 +567,7 @@ if(NEED_ABSTRACTXAPPLICATION) target_compile_options(MagnumAbstractXApplication PRIVATE "-Wno-old-style-cast") # Assuming that PIC is not needed because the Application lib is always # linked to the executable and not to any intermediate shared lib + set_target_properties(MagnumAbstractXApplication PROPERTIES FOLDER "Magnum/Platform") install(FILES ${MagnumAbstractXApplication_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Platform) endif() @@ -586,6 +589,7 @@ if(NEED_GLXCONTEXTHANDLER) # Assuming that PIC is not needed because this is part of Application lib, # which is always linked to the executable and not to any intermediate # shared lib + set_target_properties(MagnumGlxContextHandler PROPERTIES FOLDER "Magnum/Platform") endif() # EGL context handler @@ -614,6 +618,7 @@ if(NEED_EGLCONTEXTHANDLER) # Assuming that PIC is not needed because this is part of Application lib, # which is always linked to the executable and not to any intermediate # shared lib + set_target_properties(MagnumEglContextHandler PROPERTIES FOLDER "Magnum/Platform") endif() # Platform-specific sources for context library @@ -648,6 +653,7 @@ if(NEED_CGLCONTEXT OR WITH_CGLCONTEXT) if(BUILD_STATIC_PIC) set_target_properties(MagnumCglContextObjects PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() + set_target_properties(MagnumCglContextObjects PROPERTIES FOLDER "Magnum/Platform") # Also create proper static library, if requested if(WITH_CGLCONTEXT) @@ -688,6 +694,7 @@ if(NEED_EGLCONTEXT OR WITH_EGLCONTEXT) if(BUILD_STATIC_PIC) set_target_properties(MagnumEglContextObjects PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() + set_target_properties(MagnumEglContextObjects PROPERTIES FOLDER "Magnum/Platform") # Also create proper static library, if requested if(WITH_EGLCONTEXT) @@ -722,6 +729,7 @@ if(NEED_GLXCONTEXT OR WITH_GLXCONTEXT) if(BUILD_STATIC_PIC) set_target_properties(MagnumGlxContextObjects PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() + set_target_properties(MagnumGlxContextObjects PROPERTIES FOLDER "Magnum/Platform") # Also create proper static library, if requested if(WITH_GLXCONTEXT) @@ -801,6 +809,7 @@ if(WITH_MAGNUMINFO) else() message(FATAL_ERROR "magnum-info is not available on this platform. Set WITH_MAGNUMINFO to OFF to skip building it.") endif() + set_target_properties(magnum-info PROPERTIES FOLDER "Magnum/Platform") install(TARGETS magnum-info DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}) if(CORRADE_TARGET_NACL) @@ -820,3 +829,4 @@ endif() # Force IDEs display also all header files and additional files in project view add_custom_target(MagnumPlatform SOURCES ${MagnumPlatform_HEADERS} ${MagnumPlatform_FILES}) +set_target_properties(MagnumPlatform PROPERTIES FOLDER "Magnum/Platform") diff --git a/src/Magnum/Primitives/Test/CMakeLists.txt b/src/Magnum/Primitives/Test/CMakeLists.txt index 3caa1d041..6a014b415 100644 --- a/src/Magnum/Primitives/Test/CMakeLists.txt +++ b/src/Magnum/Primitives/Test/CMakeLists.txt @@ -28,3 +28,11 @@ corrade_add_test(PrimitivesCircleTest CircleTest.cpp LIBRARIES MagnumPrimitives) corrade_add_test(PrimitivesCylinderTest CylinderTest.cpp LIBRARIES MagnumPrimitives) corrade_add_test(PrimitivesIcosphereTest IcosphereTest.cpp LIBRARIES MagnumPrimitives) corrade_add_test(PrimitivesUVSphereTest UVSphereTest.cpp LIBRARIES MagnumPrimitives) + +set_target_properties( + PrimitivesCapsuleTest + PrimitivesCircleTest + PrimitivesCylinderTest + PrimitivesIcosphereTest + PrimitivesUVSphereTest + PROPERTIES FOLDER "Magnum/Primitives/Test") diff --git a/src/Magnum/SceneGraph/CMakeLists.txt b/src/Magnum/SceneGraph/CMakeLists.txt index 06e24c5da..53ae0b2c3 100644 --- a/src/Magnum/SceneGraph/CMakeLists.txt +++ b/src/Magnum/SceneGraph/CMakeLists.txt @@ -86,6 +86,7 @@ endif() if(NOT BUILD_STATIC OR BUILD_STATIC_PIC) set_target_properties(MagnumSceneGraphObjects PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() +set_target_properties(MagnumSceneGraphObjects PROPERTIES FOLDER "Magnum/SceneGraph") # Main SceneGraph library add_library(MagnumSceneGraph ${SHARED_OR_STATIC} @@ -110,7 +111,9 @@ if(BUILD_TESTS) add_library(MagnumSceneGraphTestLib ${SHARED_OR_STATIC} $ ${MagnumSceneGraph_GracefulAssert_SRCS}) - set_target_properties(MagnumSceneGraphTestLib PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumSceneGraphTestLib PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/SceneGraph") target_compile_definitions(MagnumSceneGraphTestLib PRIVATE "CORRADE_GRACEFUL_ASSERT" "MagnumSceneGraph_EXPORTS") target_link_libraries(MagnumSceneGraphTestLib MagnumMathTestLib) diff --git a/src/Magnum/SceneGraph/Test/CMakeLists.txt b/src/Magnum/SceneGraph/Test/CMakeLists.txt index 8c21b2313..cf50ca656 100644 --- a/src/Magnum/SceneGraph/Test/CMakeLists.txt +++ b/src/Magnum/SceneGraph/Test/CMakeLists.txt @@ -41,4 +41,18 @@ set_property(TARGET SceneGraphRigidMatrixTrans___2DTest SceneGraphRigidMatrixTrans___3DTest SceneGraphTranslationTransfo___Test - PROPERTY COMPILE_DEFINITIONS "CORRADE_GRACEFUL_ASSERT") + APPEND PROPERTY COMPILE_DEFINITIONS "CORRADE_GRACEFUL_ASSERT") + +set_target_properties( + SceneGraphAnimableTest + SceneGraphCameraTest + SceneGraphDualComplexTransfo___Test + SceneGraphDualQuaternionTran___Test + SceneGraphMatrixTransforma___2DTest + SceneGraphMatrixTransforma___3DTest + SceneGraphObjectTest + SceneGraphRigidMatrixTrans___2DTest + SceneGraphRigidMatrixTrans___3DTest + SceneGraphSceneTest + SceneGraphTranslationTransfo___Test + PROPERTIES FOLDER "Magnum/SceneGraph/Test") diff --git a/src/Magnum/Shaders/CMakeLists.txt b/src/Magnum/Shaders/CMakeLists.txt index 69c4e4288..1683482ea 100644 --- a/src/Magnum/Shaders/CMakeLists.txt +++ b/src/Magnum/Shaders/CMakeLists.txt @@ -24,6 +24,7 @@ # corrade_add_resource(MagnumShaders_RCS resources.conf) +set_target_properties(MagnumShaders_RCS-dependencies PROPERTIES FOLDER "Magnum/Shaders") set(MagnumShaders_SRCS AbstractVector.cpp diff --git a/src/Magnum/Shaders/Test/CMakeLists.txt b/src/Magnum/Shaders/Test/CMakeLists.txt index 12012b8d6..0682e6fa4 100644 --- a/src/Magnum/Shaders/Test/CMakeLists.txt +++ b/src/Magnum/Shaders/Test/CMakeLists.txt @@ -30,6 +30,15 @@ corrade_add_test(ShadersPhongTest PhongTest.cpp LIBRARIES MagnumShaders) corrade_add_test(ShadersVectorTest VectorTest.cpp LIBRARIES MagnumShaders) corrade_add_test(ShadersVertexColorTest VertexColorTest.cpp LIBRARIES MagnumShaders) +set_target_properties( + ShadersDistanceFieldVectorTest + ShadersFlatTest + ShadersMeshVisualizerTest + ShadersPhongTest + ShadersVectorTest + ShadersVertexColorTest + PROPERTIES FOLDER "Magnum/Shaders/Test") + if(BUILD_GL_TESTS) corrade_add_test(ShadersDistanceFieldVectorGLTest DistanceFieldVectorGLTest.cpp LIBRARIES MagnumShaders MagnumOpenGLTester) corrade_add_test(ShadersFlatGLTest FlatGLTest.cpp LIBRARIES MagnumShaders MagnumOpenGLTester) @@ -37,4 +46,13 @@ if(BUILD_GL_TESTS) corrade_add_test(ShadersPhongGLTest PhongGLTest.cpp LIBRARIES MagnumShaders MagnumOpenGLTester) corrade_add_test(ShadersVectorGLTest VectorGLTest.cpp LIBRARIES MagnumShaders MagnumOpenGLTester) corrade_add_test(ShadersVertexColorGLTest VertexColorGLTest.cpp LIBRARIES MagnumShaders MagnumOpenGLTester) + + set_target_properties( + ShadersDistanceFieldVectorGLTest + ShadersFlatGLTest + ShadersMeshVisualizerGLTest + ShadersPhongGLTest + ShadersVectorGLTest + ShadersVertexColorGLTest + PROPERTIES FOLDER "Magnum/Shaders/Test") endif() diff --git a/src/Magnum/Shapes/Test/CMakeLists.txt b/src/Magnum/Shapes/Test/CMakeLists.txt index 28ead6adc..1ec02b3e7 100644 --- a/src/Magnum/Shapes/Test/CMakeLists.txt +++ b/src/Magnum/Shapes/Test/CMakeLists.txt @@ -36,3 +36,18 @@ corrade_add_test(ShapesCompositionTest CompositionTest.cpp LIBRARIES MagnumShape corrade_add_test(ShapesSphereTest SphereTest.cpp LIBRARIES MagnumShapes) corrade_add_test(ShapesShapeTest ShapeTest.cpp LIBRARIES MagnumShapes) + +set_target_properties( + ShapesShapeImplementationTest + ShapesAxisAlignedBoxTest + ShapesBoxTest + ShapesCapsuleTest + ShapesCollisionTest + ShapesCylinderTest + ShapesLineTest + ShapesPlaneTest + ShapesPointTest + ShapesCompositionTest + ShapesSphereTest + ShapesShapeTest + PROPERTIES FOLDER "Magnum/Shapes/Test") diff --git a/src/Magnum/Test/CMakeLists.txt b/src/Magnum/Test/CMakeLists.txt index 30d0acca1..8bf0a33f3 100644 --- a/src/Magnum/Test/CMakeLists.txt +++ b/src/Magnum/Test/CMakeLists.txt @@ -46,8 +46,33 @@ corrade_add_test(TagsTest TagsTest.cpp LIBRARIES Magnum) corrade_add_test(TextureTest TextureTest.cpp LIBRARIES Magnum) corrade_add_test(VersionTest VersionTest.cpp LIBRARIES Magnum) +set_target_properties( + ArrayTest + AttributeTest + AbstractShaderProgramTest + BufferTest + FormatTest + ContextTest + CubeMapTextureTest + DefaultFramebufferTest + FramebufferTest + ImageTest + ImageViewTest + MeshTest + PixelStorageTest + RendererTest + RenderbufferTest + ResourceManagerTest + SamplerTest + ShaderTest + TagsTest + TextureTest + VersionTest + PROPERTIES FOLDER "Magnum/Test") + if(NOT MAGNUM_TARGET_WEBGL) corrade_add_test(DebugOutputTest DebugOutputTest.cpp LIBRARIES Magnum) + set_target_properties(DebugOutputTest PROPERTIES FOLDER "Magnum/Test") endif() if(NOT MAGNUM_TARGET_GLES2) @@ -55,24 +80,40 @@ if(NOT MAGNUM_TARGET_GLES2) corrade_add_test(PrimitiveQueryTest PrimitiveQueryTest.cpp LIBRARIES Magnum) corrade_add_test(TextureArrayTest TextureArrayTest.cpp LIBRARIES Magnum) corrade_add_test(TransformFeedbackTest TransformFeedbackTest.cpp LIBRARIES Magnum) + + set_target_properties( + BufferImageTest + PrimitiveQueryTest + TextureArrayTest + TransformFeedbackTest + PROPERTIES FOLDER "Magnum/Test") endif() if(NOT MAGNUM_TARGET_GLES2 AND NOT MAGNUM_TARGET_WEBGL) corrade_add_test(BufferTextureTest BufferTextureTest.cpp LIBRARIES Magnum) corrade_add_test(CubeMapTextureArrayTest CubeMapTextureArrayTest.cpp LIBRARIES Magnum) corrade_add_test(MultisampleTextureTest MultisampleTextureTest.cpp LIBRARIES Magnum) + + set_target_properties( + BufferTextureTest + CubeMapTextureArrayTest + MultisampleTextureTest + PROPERTIES FOLDER "Magnum/Test") endif() if(NOT (MAGNUM_TARGET_WEBGL AND MAGNUM_TARGET_GLES2)) corrade_add_test(SampleQueryTest SampleQueryTest.cpp LIBRARIES Magnum) + set_target_properties(SampleQueryTest PROPERTIES FOLDER "Magnum/Test") endif() if(NOT MAGNUM_TARGET_WEBGL) corrade_add_test(TimeQueryTest TimeQueryTest.cpp LIBRARIES Magnum) + set_target_properties(TimeQueryTest PROPERTIES FOLDER "Magnum/Test") endif() if(NOT MAGNUM_TARGET_GLES) corrade_add_test(RectangleTextureTest RectangleTextureTest.cpp LIBRARIES MagnumOpenGLTester) + set_target_properties(RectangleTextureTest PROPERTIES FOLDER "Magnum/Test") endif() add_library(ResourceManagerLocalInstanceTestLib ${SHARED_OR_STATIC} ResourceManagerLocalInstanceTestLib.cpp) @@ -81,6 +122,10 @@ if(NOT BUILD_STATIC) target_compile_definitions(ResourceManagerLocalInstanceTestLib PRIVATE "ResourceManagerLocalInstanceTestLib_EXPORTS") endif() corrade_add_test(ResourceManagerLocalInstanceTest ResourceManagerLocalInstanceTest.cpp LIBRARIES Magnum ResourceManagerLocalInstanceTestLib) +set_target_properties( + ResourceManagerLocalInstanceTestLib + ResourceManagerLocalInstanceTest + PROPERTIES FOLDER "Magnum/Test") if(BUILD_GL_TESTS) corrade_add_test(AbstractObjectGLTest AbstractObjectGLTest.cpp LIBRARIES MagnumOpenGLTester) @@ -109,6 +154,28 @@ if(BUILD_GL_TESTS) corrade_add_test(ShaderGLTest ShaderGLTest.cpp LIBRARIES MagnumOpenGLTester) target_include_directories(ShaderGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + set_target_properties( + AbstractObjectGLTest + AbstractQueryGLTest + AbstractTextureGLTest + BufferGLTest + ContextGLTest + CubeMapTextureGLTest + DebugOutputGLTest + FramebufferGLTest + MeshGLTest + PixelStorageGLTest + RenderbufferGLTest + SampleQueryGLTest + TextureGLTest + TimeQueryGLTest + + AbstractShaderProgramGLTest + AbstractShaderProgramGLTest_RES-dependencies + + ShaderGLTest + PROPERTIES FOLDER "Magnum/Test") + if(NOT MAGNUM_TARGET_GLES2) corrade_add_test(BufferImageGLTest BufferImageGLTest.cpp LIBRARIES MagnumOpenGLTester) corrade_add_test(BufferTextureGLTest BufferTextureGLTest.cpp LIBRARIES MagnumOpenGLTester) @@ -117,9 +184,20 @@ if(BUILD_GL_TESTS) corrade_add_test(PrimitiveQueryGLTest PrimitiveQueryGLTest.cpp LIBRARIES MagnumOpenGLTester) corrade_add_test(TextureArrayGLTest TextureArrayGLTest.cpp LIBRARIES MagnumOpenGLTester) corrade_add_test(TransformFeedbackGLTest TransformFeedbackGLTest.cpp LIBRARIES MagnumOpenGLTester) + + set_target_properties( + BufferImageGLTest + BufferTextureGLTest + CubeMapTextureArrayGLTest + MultisampleTextureGLTest + PrimitiveQueryGLTest + TextureArrayGLTest + TransformFeedbackGLTest + PROPERTIES FOLDER "Magnum/Test") endif() if(NOT MAGNUM_TARGET_GLES) corrade_add_test(RectangleTextureGLTest RectangleTextureGLTest.cpp LIBRARIES MagnumOpenGLTester) + set_target_properties(RectangleTextureGLTest PROPERTIES FOLDER "Magnum/Test") endif() endif() diff --git a/src/Magnum/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt index 904e06a79..5cef761d9 100644 --- a/src/Magnum/Text/CMakeLists.txt +++ b/src/Magnum/Text/CMakeLists.txt @@ -88,6 +88,7 @@ if(WITH_FONTCONVERTER) else() message(FATAL_ERROR "magnum-fontconverter is not available on this platform. Set WITH_FONTCONVERTER to OFF to suppress this warning.") endif() + set_target_properties(magnum-fontconverter PROPERTIES FOLDER "Magnum/Text") install(TARGETS magnum-fontconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}) diff --git a/src/Magnum/Text/Test/CMakeLists.txt b/src/Magnum/Text/Test/CMakeLists.txt index 9afb4ea83..65545e0ac 100644 --- a/src/Magnum/Text/Test/CMakeLists.txt +++ b/src/Magnum/Text/Test/CMakeLists.txt @@ -44,7 +44,18 @@ corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp target_include_directories(TextAbstractFontConverterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(TextAbstractLayouterTest AbstractLayouterTest.cpp LIBRARIES Magnum MagnumText) +set_target_properties( + TextAbstractFontTest + TextAbstractFontConverterTest + TextAbstractLayouterTest + PROPERTIES FOLDER "Magnum/Text/Test") + if(BUILD_GL_TESTS) corrade_add_test(TextGlyphCacheGLTest GlyphCacheGLTest.cpp LIBRARIES MagnumText MagnumOpenGLTester) corrade_add_test(TextRendererGLTest RendererGLTest.cpp LIBRARIES MagnumText MagnumOpenGLTester) + + set_target_properties( + TextGlyphCacheGLTest + TextRendererGLTest + PROPERTIES FOLDER "Magnum/Text/Test") endif() diff --git a/src/Magnum/TextureTools/CMakeLists.txt b/src/Magnum/TextureTools/CMakeLists.txt index 3602fc156..afbfaeaff 100644 --- a/src/Magnum/TextureTools/CMakeLists.txt +++ b/src/Magnum/TextureTools/CMakeLists.txt @@ -24,6 +24,7 @@ # corrade_add_resource(MagnumTextureTools_RCS resources.conf) +set_target_properties(MagnumTextureTools_RCS-dependencies PROPERTIES FOLDER "Magnum/TextureTools") set(MagnumTextureTools_SRCS Atlas.cpp @@ -84,6 +85,7 @@ if(WITH_DISTANCEFIELDCONVERTER) else() message(FATAL_ERROR "magnum-distancefieldconverter is not available on this platform. Set WITH_DISTANCEFIELDCONVERTER to OFF to suppress this warning.") endif() + set_target_properties(magnum-distancefieldconverter PROPERTIES FOLDER "Magnum/TextureTools") install(TARGETS magnum-distancefieldconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}) diff --git a/src/Magnum/TextureTools/Test/CMakeLists.txt b/src/Magnum/TextureTools/Test/CMakeLists.txt index 91d919b58..efadca120 100644 --- a/src/Magnum/TextureTools/Test/CMakeLists.txt +++ b/src/Magnum/TextureTools/Test/CMakeLists.txt @@ -24,3 +24,4 @@ # corrade_add_test(TextureToolsAtlasTest AtlasTest.cpp LIBRARIES MagnumTextureTools) +set_target_properties(TextureToolsAtlasTest PROPERTIES FOLDER "Magnum/TextureTools/Test") diff --git a/src/Magnum/Trade/CMakeLists.txt b/src/Magnum/Trade/CMakeLists.txt index 969df8962..f9bfadeca 100644 --- a/src/Magnum/Trade/CMakeLists.txt +++ b/src/Magnum/Trade/CMakeLists.txt @@ -43,6 +43,7 @@ set(MagnumTrade_HEADERS # Force IDEs to display all header files in project view add_custom_target(MagnumTrade SOURCES ${MagnumTrade_HEADERS}) +set_target_properties(MagnumTrade PROPERTIES FOLDER "Magnum/Trade") install(FILES ${MagnumTrade_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Trade) @@ -53,6 +54,7 @@ if(WITH_IMAGECONVERTER) add_executable(magnum-imageconverter imageconverter.cpp) target_include_directories(magnum-imageconverter PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(magnum-imageconverter Magnum) + set_target_properties(magnum-imageconverter PROPERTIES FOLDER "Magnum/Trade") install(TARGETS magnum-imageconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}) diff --git a/src/Magnum/Trade/Test/CMakeLists.txt b/src/Magnum/Trade/Test/CMakeLists.txt index 79e75cf48..9ae82b2fb 100644 --- a/src/Magnum/Trade/Test/CMakeLists.txt +++ b/src/Magnum/Trade/Test/CMakeLists.txt @@ -50,3 +50,18 @@ corrade_add_test(TradeObjectData2DTest ObjectData2DTest.cpp LIBRARIES Magnum) corrade_add_test(TradeObjectData3DTest ObjectData3DTest.cpp LIBRARIES Magnum) corrade_add_test(TradeSceneDataTest SceneDataTest.cpp LIBRARIES Magnum) corrade_add_test(TradeTextureDataTest TextureDataTest.cpp LIBRARIES Magnum) + +set_target_properties( + TradeAbstractImageConverterTest + TradeAbstractImporterTest + TradeCameraDataTest + TradeImageDataTest + TradeLightDataTest + TradeMaterialDataTest + TradeMeshData2DTest + TradeMeshData3DTest + TradeObjectData2DTest + TradeObjectData3DTest + TradeSceneDataTest + TradeTextureDataTest + PROPERTIES FOLDER "Magnum/Trade/Test") diff --git a/src/MagnumExternal/OpenGL/GL/CMakeLists.txt b/src/MagnumExternal/OpenGL/GL/CMakeLists.txt index 5a32bfd3e..bcd7bff68 100644 --- a/src/MagnumExternal/OpenGL/GL/CMakeLists.txt +++ b/src/MagnumExternal/OpenGL/GL/CMakeLists.txt @@ -26,12 +26,12 @@ # flextGLPlatform.cpp is compiled as part of Magnum*Context libraries in Platform add_library(MagnumFlextGLObjects OBJECT flextGL.cpp) target_include_directories(MagnumFlextGLObjects PUBLIC $) - if(NOT BUILD_STATIC) target_compile_definitions(MagnumFlextGLObjects PRIVATE "FlextGL_EXPORTS") endif() if(NOT BUILD_STATIC OR BUILD_STATIC_PIC) set_target_properties(MagnumFlextGLObjects PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() +set_target_properties(MagnumFlextGLObjects PROPERTIES FOLDER "MagnumExternal/OpenGL") install(FILES flextGL.h DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/OpenGL/GL) diff --git a/src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt b/src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt index c6fcdfde8..571ad816a 100644 --- a/src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt +++ b/src/MagnumExternal/OpenGL/GLES2/CMakeLists.txt @@ -47,13 +47,13 @@ if(NOT CORRADE_TARGET_NACL AND NOT CORRADE_TARGET_EMSCRIPTEN) # flextGLPlatform*.cpp is compiled as part of Magnum*Context libraries in Platform add_library(MagnumFlextGLObjects OBJECT ${MagnumOpenGL_SRCS}) target_include_directories(MagnumFlextGLObjects PUBLIC $) - if(NOT BUILD_STATIC) target_compile_definitions(MagnumFlextGLObjects PRIVATE "FlextGL_EXPORTS") endif() if(NOT BUILD_STATIC OR BUILD_STATIC_PIC) set_target_properties(MagnumFlextGLObjects PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() + set_target_properties(MagnumFlextGLObjects PROPERTIES FOLDER "MagnumExternal/OpenGL") endif() install(FILES ${MagnumOpenGL_HEADERS} DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/OpenGL/GLES2) diff --git a/src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt b/src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt index 2009f8dcf..2d2798695 100644 --- a/src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt +++ b/src/MagnumExternal/OpenGL/GLES3/CMakeLists.txt @@ -45,13 +45,13 @@ if(NOT CORRADE_TARGET_NACL AND NOT CORRADE_TARGET_EMSCRIPTEN) # flextGLPlatform*.cpp is compiled as part of Magnum*Context libraries in Platform add_library(MagnumFlextGLObjects OBJECT ${MagnumOpenGL_SRCS}) target_include_directories(MagnumFlextGLObjects PUBLIC $) - if(NOT BUILD_STATIC) target_compile_definitions(MagnumFlextGLObjects PRIVATE "FlextGL_EXPORTS") endif() if(NOT BUILD_STATIC OR BUILD_STATIC_PIC) set_target_properties(MagnumFlextGLObjects PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() + set_target_properties(MagnumFlextGLObjects PROPERTIES FOLDER "MagnumExternal/OpenGL") endif() install(FILES ${MagnumOpenGL_HEADERS} DESTINATION ${MAGNUM_EXTERNAL_INCLUDE_INSTALL_DIR}/OpenGL/GLES3)