diff --git a/src/Magnum/Audio/CMakeLists.txt b/src/Magnum/Audio/CMakeLists.txt index 549e6ff0a..d24ef9d81 100644 --- a/src/Magnum/Audio/CMakeLists.txt +++ b/src/Magnum/Audio/CMakeLists.txt @@ -59,7 +59,9 @@ add_library(MagnumAudio ${SHARED_OR_STATIC} ${MagnumAudio_SRCS} ${MagnumAudio_HEADERS}) target_include_directories(MagnumAudio PUBLIC ${OPENAL_INCLUDE_DIR}) -set_target_properties(MagnumAudio PROPERTIES DEBUG_POSTFIX "-d") +set_target_properties(MagnumAudio PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Audio") if(BUILD_STATIC_PIC) set_target_properties(MagnumAudio PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt index d70e02b1c..f0a86245b 100644 --- a/src/Magnum/CMakeLists.txt +++ b/src/Magnum/CMakeLists.txt @@ -246,7 +246,9 @@ add_library(Magnum ${SHARED_OR_STATIC} ${Magnum_HEADERS} ${Magnum_PRIVATE_HEADERS} $) -set_target_properties(Magnum PROPERTIES DEBUG_POSTFIX "-d") +set_target_properties(Magnum PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum") if(NOT BUILD_STATIC) target_compile_definitions(Magnum PRIVATE "FlextGL_EXPORTS") elseif(BUILD_STATIC_PIC) @@ -291,7 +293,9 @@ if(WITH_OPENGLTESTER) ${MagnumOpenGLTester_SRCS} ${MagnumOpenGLTester_HEADERS} ${MagnumOpenGLTester_DEPRECATED_HEADERS}) # TODO: remove when the header is removed - set_target_properties(MagnumOpenGLTester PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumOpenGLTester PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum") # Assuming that PIC is not needed because the Tester lib is always linked # to the executable and not to any intermediate shared lib diff --git a/src/Magnum/DebugTools/CMakeLists.txt b/src/Magnum/DebugTools/CMakeLists.txt index c154a2631..adb657059 100644 --- a/src/Magnum/DebugTools/CMakeLists.txt +++ b/src/Magnum/DebugTools/CMakeLists.txt @@ -111,11 +111,12 @@ add_library(MagnumDebugTools ${SHARED_OR_STATIC} ${MagnumDebugTools_SRCS} ${MagnumDebugTools_HEADERS} ${MagnumDebugTools_PRIVATE_HEADERS}) -set_target_properties(MagnumDebugTools PROPERTIES DEBUG_POSTFIX "-d") +set_target_properties(MagnumDebugTools PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/DebugTools") if(BUILD_STATIC_PIC) set_target_properties(MagnumDebugTools PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() - target_link_libraries(MagnumDebugTools Magnum) if(Corrade_TestSuite_FOUND) target_link_libraries(MagnumDebugTools Corrade::TestSuite) diff --git a/src/Magnum/MeshTools/CMakeLists.txt b/src/Magnum/MeshTools/CMakeLists.txt index e2b2fcdd8..24758a29f 100644 --- a/src/Magnum/MeshTools/CMakeLists.txt +++ b/src/Magnum/MeshTools/CMakeLists.txt @@ -68,11 +68,12 @@ endif() add_library(MagnumMeshTools ${SHARED_OR_STATIC} $ ${MagnumMeshTools_GracefulAssert_SRCS}) -set_target_properties(MagnumMeshTools PROPERTIES DEBUG_POSTFIX "-d") +set_target_properties(MagnumMeshTools PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/MeshTools") if(BUILD_STATIC_PIC) set_target_properties(MagnumMeshTools PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() - target_link_libraries(MagnumMeshTools Magnum) install(TARGETS MagnumMeshTools diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt index 185ae4996..795cf1a06 100644 --- a/src/Magnum/Platform/CMakeLists.txt +++ b/src/Magnum/Platform/CMakeLists.txt @@ -84,7 +84,9 @@ if(WITH_ANDROIDAPPLICATION) # function is not exported and thus the app startup fails if I don't # disable hidden visibility for the file. target_include_directories(MagnumAndroidApplication PUBLIC ${ANDROID_NATIVE_APP_GLUE_INCLUDE_DIR}) - set_target_properties(MagnumAndroidApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumAndroidApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") # Assuming that PIC is not needed because the Application lib is always # linked to the executable and not to any intermediate shared lib target_link_libraries(MagnumAndroidApplication Magnum) @@ -114,7 +116,9 @@ if(WITH_GLFWAPPLICATION) add_library(MagnumGlfwApplication STATIC ${MagnumGlfwApplication_SRCS} ${MagnumGlfwApplication_HEADERS}) - set_target_properties(MagnumGlfwApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumGlfwApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") # Assuming that PIC is not needed because the Application lib is always # linked to the executable and not to any intermediate shared lib target_link_libraries(MagnumGlfwApplication Magnum GLFW::GLFW) @@ -144,7 +148,9 @@ if(WITH_GLUTAPPLICATION) add_library(MagnumGlutApplication STATIC ${MagnumGlutApplication_SRCS} ${MagnumGlutApplication_HEADERS}) - set_target_properties(MagnumGlutApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumGlutApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") # Assuming that PIC is not needed because the Application lib is always # linked to the executable and not to any intermediate shared lib target_include_directories(MagnumGlutApplication PUBLIC ${GLUT_INCLUDE_DIR}) @@ -175,7 +181,9 @@ if(WITH_SDL2APPLICATION) add_library(MagnumSdl2Application STATIC ${MagnumSdl2Application_SRCS} ${MagnumSdl2Application_HEADERS}) - set_target_properties(MagnumSdl2Application PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumSdl2Application PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") # Assuming that PIC is not needed because the Application lib is always # linked to the executable and not to any intermediate shared lib target_link_libraries(MagnumSdl2Application Magnum SDL2::SDL2) @@ -202,7 +210,9 @@ if(WITH_NACLAPPLICATION) add_library(MagnumNaClApplication STATIC ${MagnumNaClApplication_SRCS} ${MagnumNaClApplication_HEADERS}) - set_target_properties(MagnumNaClApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumNaClApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") # Assuming that PIC is not needed because the Application lib is always # linked to the executable and not to any intermediate shared lib target_link_libraries(MagnumNaClApplication Magnum ppapi_cpp ppapi) @@ -229,7 +239,9 @@ if(WITH_WINDOWLESSNACLAPPLICATION) add_library(MagnumWindowlessNaClApplication STATIC ${MagnumWindowlessNaClApplication_SRCS} ${MagnumWindowlessNaClApplication_HEADERS}) - set_target_properties(MagnumWindowlessNaClApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumWindowlessNaClApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") if(BUILD_STATIC_PIC) set_target_properties(MagnumWindowlessNaClApplication PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() @@ -279,7 +291,9 @@ if(WITH_GLXAPPLICATION) add_library(MagnumGlxApplication STATIC ${MagnumGlxApplication_SRCS} ${MagnumGlxApplication_HEADERS}) - set_target_properties(MagnumGlxApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumGlxApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") # Assuming that PIC is not needed because the Application lib is always # linked to the executable and not to any intermediate shared lib target_include_directories(MagnumGlxApplication PUBLIC ${X11_INCLUDE_DIR}) @@ -311,7 +325,9 @@ if(WITH_XEGLAPPLICATION) add_library(MagnumXEglApplication STATIC ${MagnumXEglApplication_SRCS} ${MagnumXEglApplication_HEADERS}) - set_target_properties(MagnumXEglApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumXEglApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") # Assuming that PIC is not needed because the Application lib is always # linked to the executable and not to any intermediate shared lib target_include_directories(MagnumXEglApplication PUBLIC ${X11_INCLUDE_DIR}) @@ -351,7 +367,9 @@ if(WITH_WINDOWLESSEGLAPPLICATION) ${MagnumWindowlessEglApplication_SRCS} ${MagnumWindowlessEglApplication_HEADERS} ${MagnumWindowlessEglApplication_PRIVATE_HEADERS}) - set_target_properties(MagnumWindowlessEglApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumWindowlessEglApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") if(BUILD_STATIC_PIC) set_target_properties(MagnumWindowlessEglApplication PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() @@ -379,8 +397,10 @@ if(WITH_WINDOWLESSGLXAPPLICATION) add_library(MagnumWindowlessGlxApplication STATIC ${MagnumWindowlessGlxApplication_SRCS} ${MagnumWindowlessGlxApplication_HEADERS}) + set_target_properties(MagnumWindowlessGlxApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") # X11 macros are a mess, disable warnings for C-style casts - set_target_properties(MagnumWindowlessGlxApplication PROPERTIES DEBUG_POSTFIX "-d") target_compile_options(MagnumWindowlessGlxApplication PRIVATE "-Wno-old-style-cast") if(BUILD_STATIC_PIC) set_target_properties(MagnumWindowlessGlxApplication PROPERTIES POSITION_INDEPENDENT_CODE ON) @@ -415,7 +435,9 @@ if(WITH_WINDOWLESSIOSAPPLICATION) add_library(MagnumWindowlessIosApplication STATIC ${MagnumWindowlessIosApplication_SRCS} ${MagnumWindowlessIosApplication_HEADERS}) - set_target_properties(MagnumWindowlessIosApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumWindowlessIosApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") if(BUILD_STATIC_PIC) set_target_properties(MagnumWindowlessIosApplication PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() @@ -446,7 +468,9 @@ if(WITH_WINDOWLESSWGLAPPLICATION) add_library(MagnumWindowlessWglApplication STATIC ${MagnumWindowlessWglApplication_SRCS} ${MagnumWindowlessWglApplication_HEADERS}) - set_target_properties(MagnumWindowlessWglApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumWindowlessWglApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") target_compile_definitions(MagnumWindowlessWglApplication PRIVATE "UNICODE") if(BUILD_STATIC_PIC) set_target_properties(MagnumWindowlessWglApplication PROPERTIES POSITION_INDEPENDENT_CODE ON) @@ -480,7 +504,9 @@ if(WITH_WINDOWLESSWINDOWSEGLAPPLICATION) ${MagnumWindowlessWindowsEglApplication_SRCS} ${MagnumWindowlessWindowsEglApplication_HEADERS} ${MagnumWindowlessWindowsEglApplication_PRIVATE_HEADERS}) - set_target_properties(MagnumWindowlessWindowsEglApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumWindowlessWindowsEglApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") target_compile_definitions(MagnumWindowlessWindowsEglApplication PRIVATE "UNICODE") if(BUILD_STATIC_PIC) set_target_properties(MagnumWindowlessWindowsEglApplication PROPERTIES POSITION_INDEPENDENT_CODE ON) @@ -509,7 +535,9 @@ if(WITH_WINDOWLESSCGLAPPLICATION) add_library(MagnumWindowlessCglApplication STATIC ${MagnumWindowlessCglApplication_SRCS} ${MagnumWindowlessCglApplication_HEADERS}) - set_target_properties(MagnumWindowlessCglApplication PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumWindowlessCglApplication PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") if(BUILD_STATIC_PIC) set_target_properties(MagnumWindowlessCglApplication PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() @@ -628,7 +656,9 @@ if(NEED_CGLCONTEXT OR WITH_CGLCONTEXT) # consisted only of $ entries, thus compiling the # sources again in this case add_library(MagnumCglContext STATIC ${MagnumContext_SRCS}) - set_target_properties(MagnumCglContext PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumCglContext PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") if(BUILD_STATIC_PIC) set_target_properties(MagnumCglContext PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() @@ -665,7 +695,9 @@ if(NEED_EGLCONTEXT OR WITH_EGLCONTEXT) add_library(MagnumEglContext STATIC $ ${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details - set_target_properties(MagnumEglContext PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumEglContext PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") if(BUILD_STATIC_PIC) set_target_properties(MagnumEglContext PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() @@ -695,7 +727,9 @@ if(NEED_GLXCONTEXT OR WITH_GLXCONTEXT) # Also create proper static library, if requested if(WITH_GLXCONTEXT) add_library(MagnumGlxContext STATIC $) - set_target_properties(MagnumGlxContext PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumGlxContext PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") if(BUILD_STATIC_PIC) set_target_properties(MagnumGlxContext PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() @@ -723,7 +757,9 @@ if(NEED_WGLCONTEXT OR WITH_WGLCONTEXT) # Also create proper static library, if requested if(WITH_WGLCONTEXT) add_library(MagnumWglContext STATIC $) - set_target_properties(MagnumWglContext PROPERTIES DEBUG_POSTFIX "-d") + set_target_properties(MagnumWglContext PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Platform") if(BUILD_STATIC_PIC) set_target_properties(MagnumWglContext PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() diff --git a/src/Magnum/Primitives/CMakeLists.txt b/src/Magnum/Primitives/CMakeLists.txt index fa06b1335..7e8bf25d2 100644 --- a/src/Magnum/Primitives/CMakeLists.txt +++ b/src/Magnum/Primitives/CMakeLists.txt @@ -64,7 +64,9 @@ add_library(MagnumPrimitives ${SHARED_OR_STATIC} ${MagnumPrimitives_SRCS} ${MagnumPrimitives_HEADERS} ${MagnumPrimitives_PRIVATE_HEADERS}) -set_target_properties(MagnumPrimitives PROPERTIES DEBUG_POSTFIX "-d") +set_target_properties(MagnumPrimitives PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Primitives") if(BUILD_STATIC_PIC) set_target_properties(MagnumPrimitives PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() diff --git a/src/Magnum/SceneGraph/CMakeLists.txt b/src/Magnum/SceneGraph/CMakeLists.txt index 1886db02a..06e24c5da 100644 --- a/src/Magnum/SceneGraph/CMakeLists.txt +++ b/src/Magnum/SceneGraph/CMakeLists.txt @@ -91,7 +91,9 @@ endif() add_library(MagnumSceneGraph ${SHARED_OR_STATIC} $ ${MagnumSceneGraph_GracefulAssert_SRCS}) -set_target_properties(MagnumSceneGraph PROPERTIES DEBUG_POSTFIX "-d") +set_target_properties(MagnumSceneGraph PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/SceneGraph") if(BUILD_STATIC_PIC) set_target_properties(MagnumSceneGraph PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() diff --git a/src/Magnum/Shaders/CMakeLists.txt b/src/Magnum/Shaders/CMakeLists.txt index 249700e10..69c4e4288 100644 --- a/src/Magnum/Shaders/CMakeLists.txt +++ b/src/Magnum/Shaders/CMakeLists.txt @@ -57,7 +57,9 @@ add_library(MagnumShaders ${SHARED_OR_STATIC} ${MagnumShaders_SRCS} ${MagnumShaders_HEADERS} ${MagnumShaders_PRIVATE_HEADERS}) -set_target_properties(MagnumShaders PROPERTIES DEBUG_POSTFIX "-d") +set_target_properties(MagnumShaders PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Shaders") if(BUILD_STATIC_PIC) set_target_properties(MagnumShaders PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() diff --git a/src/Magnum/Shapes/CMakeLists.txt b/src/Magnum/Shapes/CMakeLists.txt index 860713b09..98b77daea 100644 --- a/src/Magnum/Shapes/CMakeLists.txt +++ b/src/Magnum/Shapes/CMakeLists.txt @@ -69,7 +69,9 @@ add_library(MagnumShapes ${SHARED_OR_STATIC} ${MagnumShapes_SRCS} ${MagnumShapes_HEADERS} ${MagnumShapes_PRIVATE_HEADERS}) -set_target_properties(MagnumShapes PROPERTIES DEBUG_POSTFIX "-d") +set_target_properties(MagnumShapes PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Shapes") if(BUILD_STATIC_PIC) set_target_properties(MagnumShapes PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() diff --git a/src/Magnum/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt index 6a18bfade..904e06a79 100644 --- a/src/Magnum/Text/CMakeLists.txt +++ b/src/Magnum/Text/CMakeLists.txt @@ -44,7 +44,9 @@ set(MagnumText_HEADERS add_library(MagnumText ${SHARED_OR_STATIC} ${MagnumText_SRCS} ${MagnumText_HEADERS}) -set_target_properties(MagnumText PROPERTIES DEBUG_POSTFIX "-d") +set_target_properties(MagnumText PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/Text") if(BUILD_STATIC_PIC) set_target_properties(MagnumText PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() diff --git a/src/Magnum/TextureTools/CMakeLists.txt b/src/Magnum/TextureTools/CMakeLists.txt index 3d1825009..0f453156e 100644 --- a/src/Magnum/TextureTools/CMakeLists.txt +++ b/src/Magnum/TextureTools/CMakeLists.txt @@ -40,7 +40,9 @@ set(MagnumTextureTools_HEADERS add_library(MagnumTextureTools ${SHARED_OR_STATIC} ${MagnumTextureTools_SRCS} ${MagnumTextureTools_HEADERS}) -set_target_properties(MagnumTextureTools PROPERTIES DEBUG_POSTFIX "-d") +set_target_properties(MagnumTextureTools PROPERTIES + DEBUG_POSTFIX "-d" + FOLDER "Magnum/TextureTools") if(BUILD_STATIC_PIC) set_target_properties(MagnumTextureTools PROPERTIES POSITION_INDEPENDENT_CODE ON) endif()