Browse Source

Minor code reordering.

pull/203/merge
Vladimír Vondruš 9 years ago
parent
commit
f222449bdf
  1. 7
      src/Magnum/Test/CMakeLists.txt
  2. 12
      src/Magnum/TextureTools/CMakeLists.txt

7
src/Magnum/Test/CMakeLists.txt

@ -30,9 +30,6 @@ corrade_add_test(BufferTest BufferTest.cpp LIBRARIES Magnum)
corrade_add_test(FormatTest FormatTest.cpp LIBRARIES Magnum)
corrade_add_test(ContextTest ContextTest.cpp LIBRARIES Magnum)
corrade_add_test(CubeMapTextureTest CubeMapTextureTest.cpp LIBRARIES Magnum)
if(NOT MAGNUM_TARGET_WEBGL)
corrade_add_test(DebugOutputTest DebugOutputTest.cpp LIBRARIES Magnum)
endif()
corrade_add_test(DefaultFramebufferTest DefaultFramebufferTest.cpp LIBRARIES Magnum)
corrade_add_test(FramebufferTest FramebufferTest.cpp LIBRARIES Magnum)
corrade_add_test(ImageTest ImageTest.cpp LIBRARIES Magnum)
@ -49,6 +46,10 @@ corrade_add_test(TagsTest TagsTest.cpp LIBRARIES Magnum)
corrade_add_test(TextureTest TextureTest.cpp LIBRARIES Magnum)
corrade_add_test(VersionTest VersionTest.cpp LIBRARIES Magnum)
if(NOT MAGNUM_TARGET_WEBGL)
corrade_add_test(DebugOutputTest DebugOutputTest.cpp LIBRARIES Magnum)
endif()
if(NOT MAGNUM_TARGET_GLES2)
corrade_add_test(BufferImageTest BufferImageTest.cpp LIBRARIES Magnum)
corrade_add_test(PrimitiveQueryTest PrimitiveQueryTest.cpp LIBRARIES Magnum)

12
src/Magnum/TextureTools/CMakeLists.txt

@ -48,6 +48,12 @@ if(BUILD_STATIC_PIC)
endif()
target_link_libraries(MagnumTextureTools Magnum)
install(TARGETS MagnumTextureTools
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
install(FILES ${MagnumTextureTools_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/TextureTools)
if(WITH_DISTANCEFIELDCONVERTER)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/distancefieldconverterConfigure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/distancefieldconverterConfigure.h)
@ -85,12 +91,6 @@ if(WITH_DISTANCEFIELDCONVERTER)
add_executable(Magnum::distancefieldconverter ALIAS magnum-distancefieldconverter)
endif()
install(TARGETS MagnumTextureTools
RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
install(FILES ${MagnumTextureTools_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/TextureTools)
if(BUILD_TESTS)
add_subdirectory(Test)
endif()

Loading…
Cancel
Save