Browse Source

CMake: properly specify IDE folders for everything.

pull/191/head
Vladimír Vondruš 8 years ago
parent
commit
994b9b22ba
  1. 14
      src/Magnum/Platform/Test/CMakeLists.txt
  2. 1
      src/Magnum/Primitives/Test/CMakeLists.txt
  3. 1
      src/Magnum/Test/CMakeLists.txt
  4. 1
      src/MagnumExternal/Optional/Test/CMakeLists.txt

14
src/Magnum/Platform/Test/CMakeLists.txt

@ -26,26 +26,31 @@
if(WITH_ANDROIDAPPLICATION) if(WITH_ANDROIDAPPLICATION)
add_library(PlatformAndroidApplicationTest SHARED AndroidApplicationTest.cpp) add_library(PlatformAndroidApplicationTest SHARED AndroidApplicationTest.cpp)
target_link_libraries(PlatformAndroidApplicationTest PRIVATE MagnumAndroidApplication) target_link_libraries(PlatformAndroidApplicationTest PRIVATE MagnumAndroidApplication)
set_target_properties(PlatformAndroidApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
endif() endif()
if(WITH_GLFWAPPLICATION) if(WITH_GLFWAPPLICATION)
add_executable(PlatformGlfwApplicationTest GlfwApplicationTest.cpp) add_executable(PlatformGlfwApplicationTest GlfwApplicationTest.cpp)
target_link_libraries(PlatformGlfwApplicationTest PRIVATE MagnumGlfwApplication) target_link_libraries(PlatformGlfwApplicationTest PRIVATE MagnumGlfwApplication)
set_target_properties(PlatformGlfwApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
endif() endif()
if(WITH_GLUTAPPLICATION) if(WITH_GLUTAPPLICATION)
add_executable(PlatformGlutApplicationTest GlutApplicationTest.cpp) add_executable(PlatformGlutApplicationTest GlutApplicationTest.cpp)
target_link_libraries(PlatformGlutApplicationTest PRIVATE MagnumGlutApplication) target_link_libraries(PlatformGlutApplicationTest PRIVATE MagnumGlutApplication)
set_target_properties(PlatformGlutApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
endif() endif()
if(WITH_GLXAPPLICATION) if(WITH_GLXAPPLICATION)
add_executable(PlatformGlxApplicationTest GlxApplicationTest.cpp) add_executable(PlatformGlxApplicationTest GlxApplicationTest.cpp)
target_link_libraries(PlatformGlxApplicationTest PRIVATE MagnumGlxApplication) target_link_libraries(PlatformGlxApplicationTest PRIVATE MagnumGlxApplication)
set_target_properties(PlatformGlxApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
endif() endif()
if(WITH_SDL2APPLICATION) if(WITH_SDL2APPLICATION)
add_executable(PlatformSdl2ApplicationTest Sdl2ApplicationTest.cpp) add_executable(PlatformSdl2ApplicationTest Sdl2ApplicationTest.cpp)
target_link_libraries(PlatformSdl2ApplicationTest PRIVATE MagnumSdl2Application) target_link_libraries(PlatformSdl2ApplicationTest PRIVATE MagnumSdl2Application)
set_target_properties(PlatformSdl2ApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
if(CORRADE_TARGET_IOS) if(CORRADE_TARGET_IOS)
set_target_properties(PlatformSdl2ApplicationTest PROPERTIES set_target_properties(PlatformSdl2ApplicationTest PROPERTIES
MACOSX_BUNDLE ON MACOSX_BUNDLE ON
@ -56,21 +61,25 @@ endif()
if(WITH_XEGLAPPLICATION) if(WITH_XEGLAPPLICATION)
add_executable(PlatformXEglApplicationTest XEglApplicationTest.cpp) add_executable(PlatformXEglApplicationTest XEglApplicationTest.cpp)
target_link_libraries(PlatformXEglApplicationTest PRIVATE MagnumXEglApplication) target_link_libraries(PlatformXEglApplicationTest PRIVATE MagnumXEglApplication)
set_target_properties(PlatformXEglApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
endif() endif()
if(WITH_WINDOWLESSCGLAPPLICATION) if(WITH_WINDOWLESSCGLAPPLICATION)
add_executable(PlatformWindowlessCglApplicationTest WindowlessCglApplicationTest.cpp) add_executable(PlatformWindowlessCglApplicationTest WindowlessCglApplicationTest.cpp)
target_link_libraries(PlatformWindowlessCglApplicationTest PRIVATE MagnumWindowlessCglApplication) target_link_libraries(PlatformWindowlessCglApplicationTest PRIVATE MagnumWindowlessCglApplication)
set_target_properties(PlatformWindowlessCglApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
endif() endif()
if(WITH_WINDOWLESSEGLAPPLICATION) if(WITH_WINDOWLESSEGLAPPLICATION)
add_executable(PlatformWindowlessEglApplicationTest WindowlessEglApplicationTest.cpp) add_executable(PlatformWindowlessEglApplicationTest WindowlessEglApplicationTest.cpp)
target_link_libraries(PlatformWindowlessEglApplicationTest PRIVATE MagnumWindowlessEglApplication) target_link_libraries(PlatformWindowlessEglApplicationTest PRIVATE MagnumWindowlessEglApplication)
set_target_properties(PlatformWindowlessEglApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
endif() endif()
if(WITH_WINDOWLESSGLXAPPLICATION) if(WITH_WINDOWLESSGLXAPPLICATION)
add_executable(PlatformWindowlessGlxApplicationTest WindowlessGlxApplicationTest.cpp) add_executable(PlatformWindowlessGlxApplicationTest WindowlessGlxApplicationTest.cpp)
target_link_libraries(PlatformWindowlessGlxApplicationTest PRIVATE MagnumWindowlessGlxApplication) target_link_libraries(PlatformWindowlessGlxApplicationTest PRIVATE MagnumWindowlessGlxApplication)
set_target_properties(PlatformWindowlessGlxApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
endif() endif()
if(WITH_WINDOWLESSIOSAPPLICATION) if(WITH_WINDOWLESSIOSAPPLICATION)
@ -78,15 +87,18 @@ if(WITH_WINDOWLESSIOSAPPLICATION)
target_link_libraries(PlatformWindowlessIosApplicationTest PRIVATE MagnumWindowlessIosApplication) target_link_libraries(PlatformWindowlessIosApplicationTest PRIVATE MagnumWindowlessIosApplication)
set_target_properties(PlatformWindowlessIosApplicationTest PROPERTIES set_target_properties(PlatformWindowlessIosApplicationTest PROPERTIES
MACOSX_BUNDLE ON MACOSX_BUNDLE ON
XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES") XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "YES"
FOLDER "Magnum/Platform/Test")
endif() endif()
if(WITH_WINDOWLESSWGLAPPLICATION) if(WITH_WINDOWLESSWGLAPPLICATION)
add_executable(PlatformWindowlessWglApplicationTest WindowlessWglApplicationTest.cpp) add_executable(PlatformWindowlessWglApplicationTest WindowlessWglApplicationTest.cpp)
target_link_libraries(PlatformWindowlessWglApplicationTest PRIVATE MagnumWindowlessWglApplication) target_link_libraries(PlatformWindowlessWglApplicationTest PRIVATE MagnumWindowlessWglApplication)
set_target_properties(PlatformWindowlessWglApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
endif() endif()
if(WITH_WINDOWLESSWINDOWSEGLAPPLICATION) if(WITH_WINDOWLESSWINDOWSEGLAPPLICATION)
add_executable(PlatformWindowlessWindowsEglApplicationTest WindowlessWindowsEglApplicationTest.cpp) add_executable(PlatformWindowlessWindowsEglApplicationTest WindowlessWindowsEglApplicationTest.cpp)
target_link_libraries(PlatformWindowlessWindowsEglApplicationTest PRIVATE MagnumWindowlessWindowsEglApplication) target_link_libraries(PlatformWindowlessWindowsEglApplicationTest PRIVATE MagnumWindowlessWindowsEglApplication)
set_target_properties(PlatformWindowlessWindowsEglApplicationTest PROPERTIES FOLDER "Magnum/Platform/Test")
endif() endif()

1
src/Magnum/Primitives/Test/CMakeLists.txt

@ -45,6 +45,7 @@ set_target_properties(
PrimitivesCubeTest PrimitivesCubeTest
PrimitivesConeTest PrimitivesConeTest
PrimitivesCylinderTest PrimitivesCylinderTest
PrimitivesGridTest
PrimitivesIcosphereTest PrimitivesIcosphereTest
PrimitivesLineTest PrimitivesLineTest
PrimitivesPlaneTest PrimitivesPlaneTest

1
src/Magnum/Test/CMakeLists.txt

@ -53,5 +53,6 @@ set_target_properties(
ResourceManagerTest ResourceManagerTest
ResourceManagerLocalInstanceTestLib ResourceManagerLocalInstanceTestLib
ResourceManagerLocalInstanceTest ResourceManagerLocalInstanceTest
SamplerTest
TagsTest TagsTest
PROPERTIES FOLDER "Magnum/Test") PROPERTIES FOLDER "Magnum/Test")

1
src/MagnumExternal/Optional/Test/CMakeLists.txt vendored

@ -27,6 +27,7 @@ corrade_add_test(StdOptionalTest StdOptionalTest.cpp)
target_include_directories(StdOptionalTest PRIVATE target_include_directories(StdOptionalTest PRIVATE
${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src
${PROJECT_BINARY_DIR}/src) ${PROJECT_BINARY_DIR}/src)
set_target_properties(StdOptionalTest PROPERTIES FOLDER "MagnumExternal/Optional/Test")
# Try using C++17 on newer compilers. Can't use VERSION_GREATER_EQUAL because # Try using C++17 on newer compilers. Can't use VERSION_GREATER_EQUAL because
# older CMake doesn't support these. No idea how to detect libc++ presence on # older CMake doesn't support these. No idea how to detect libc++ presence on

Loading…
Cancel
Save