From 4d9f4bd25d8098859187ee362893f1008a615f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 15 Feb 2016 17:47:20 +0100 Subject: [PATCH] Install Test/AbstractOpenGLTester.h every time. --- src/Magnum/CMakeLists.txt | 5 +++++ src/Magnum/Test/CMakeLists.txt | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt index 7f2a262e0..762ca0941 100644 --- a/src/Magnum/CMakeLists.txt +++ b/src/Magnum/CMakeLists.txt @@ -117,6 +117,9 @@ set(Magnum_HEADERS visibility.h) +set(MagnumTest_HEADERS + Test/AbstractOpenGLTester.h) + # Header files to display in project view of IDEs only set(Magnum_PRIVATE_HEADERS Implementation/BufferState.h @@ -241,6 +244,7 @@ add_library(Magnum ${SHARED_OR_STATIC} ${Magnum_SRCS} ${Magnum_HEADERS} ${Magnum_PRIVATE_HEADERS} + ${MagnumTest_HEADERS} $) set_target_properties(Magnum PROPERTIES DEBUG_POSTFIX "-d") if(NOT BUILD_STATIC) @@ -266,6 +270,7 @@ install(TARGETS Magnum LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) install(FILES ${Magnum_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) +install(FILES ${MagnumTest_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Test) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) add_subdirectory(Math) diff --git a/src/Magnum/Test/CMakeLists.txt b/src/Magnum/Test/CMakeLists.txt index 36e0c535a..248f64f81 100644 --- a/src/Magnum/Test/CMakeLists.txt +++ b/src/Magnum/Test/CMakeLists.txt @@ -91,11 +91,3 @@ if(BUILD_GL_TESTS) endif() set_target_properties(ResourceManagerTest PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT) - -set(MagnumGLTests_HEADERS AbstractOpenGLTester.h) - -# Add the header to project list of IDEs -add_custom_target(MagnumGLTests SOURCES ${MagnumGLTests_HEADERS}) - -# Install bootstrap header for GL tests to be used in dependent projects -install(FILES ${MagnumGLTests_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Test)