Browse Source

CMake: add an explicit dependency between plugins and their tests.

Otherwise selectively rebuilding a test will not do a plugin rebuild
even if it changed.
pull/369/head
Vladimír Vondruš 6 years ago
parent
commit
6e04d0d4c6
  1. 6
      src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt
  2. 6
      src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt
  3. 6
      src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt
  4. 6
      src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt
  5. 3
      src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt
  6. 6
      src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt
  7. 3
      src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt
  8. 6
      src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt
  9. 3
      src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt
  10. 3
      src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt

6
src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt

@ -56,6 +56,12 @@ if(BUILD_PLUGINS_STATIC)
if(WITH_WAVAUDIOIMPORTER)
target_link_libraries(AnyAudioImporterTest PRIVATE WavAudioImporter)
endif()
else()
# So the plugins get properly built when building the test
add_dependencies(AnyAudioImporterTest AnyAudioImporter)
if(WITH_WAVAUDIOIMPORTER)
add_dependencies(AnyAudioImporterTest WavAudioImporter)
endif()
endif()
set_target_properties(AnyAudioImporterTest PROPERTIES FOLDER "MagnumPlugins/AnyAudioImporter/Test")
if(CORRADE_BUILD_STATIC AND NOT BUILD_PLUGINS_STATIC)

6
src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt

@ -54,6 +54,12 @@ if(BUILD_PLUGINS_STATIC)
if(WITH_TGAIMAGECONVERTER)
target_link_libraries(AnyImageConverterTest PRIVATE TgaImageConverter)
endif()
else()
# So the plugins get properly built when building the test
add_dependencies(AnyImageConverterTest AnyImageConverter)
if(WITH_TGAIMAGECONVERTER)
add_dependencies(AnyImageConverterTest TgaImageConverter)
endif()
endif()
set_target_properties(AnyImageConverterTest PROPERTIES FOLDER "MagnumPlugins/AnyImageConverter/Test")
if(CORRADE_BUILD_STATIC AND NOT BUILD_PLUGINS_STATIC)

6
src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt

@ -64,6 +64,12 @@ if(BUILD_PLUGINS_STATIC)
if(WITH_TGAIMPORTER)
target_link_libraries(AnyImageImporterTest PRIVATE TgaImporter)
endif()
else()
# So the plugins get properly built when building the test
add_dependencies(AnyImageImporterTest AnyImageImporter)
if(WITH_TGAIMPORTER)
add_dependencies(AnyImageImporterTest TgaImporter)
endif()
endif()
set_target_properties(AnyImageImporterTest PROPERTIES FOLDER "MagnumPlugins/AnyImageImporter/Test")
if(CORRADE_BUILD_STATIC AND NOT BUILD_PLUGINS_STATIC)

6
src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt

@ -56,6 +56,12 @@ if(BUILD_PLUGINS_STATIC)
if(WITH_OBJIMPORTER)
target_link_libraries(AnySceneImporterTest PRIVATE ObjImporter)
endif()
else()
# So the plugins get properly built when building the test
add_dependencies(AnySceneImporterTest AnySceneImporter)
if(WITH_OBJIMPORTER)
add_dependencies(AnySceneImporterTest ObjImporter)
endif()
endif()
set_target_properties(AnySceneImporterTest PROPERTIES FOLDER "MagnumPlugins/AnySceneImporter/Test")
if(CORRADE_BUILD_STATIC AND NOT BUILD_PLUGINS_STATIC)

3
src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt

@ -71,6 +71,9 @@ if(BUILD_GL_TESTS)
target_include_directories(MagnumFontGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
if(BUILD_PLUGINS_STATIC)
target_link_libraries(MagnumFontGLTest PRIVATE MagnumFont TgaImporter)
else()
# So the plugins get properly built when building the test
add_dependencies(MagnumFontGLTest MagnumFont TgaImporter)
endif()
set_target_properties(MagnumFontGLTest PROPERTIES FOLDER "MagnumPlugins/MagnumFont/Test")
if((CORRADE_BUILD_STATIC OR MAGNUM_BUILD_STATIC) AND NOT BUILD_PLUGINS_STATIC)

6
src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt

@ -50,6 +50,12 @@ if(BUILD_PLUGINS_STATIC)
if(WITH_TGAIMPORTER)
target_link_libraries(MagnumFontConverterTest PRIVATE TgaImporter)
endif()
else()
# So the plugins get properly built when building the test
add_dependencies(MagnumFontConverterTest MagnumFontConverter)
if(WITH_TGAIMPORTER)
add_dependencies(MagnumFontConverterTest TgaImporter)
endif()
endif()
set_target_properties(MagnumFontConverterTest PROPERTIES FOLDER "MagnumPlugins/MagnumFontConverter/Test")
if(CORRADE_BUILD_STATIC AND NOT BUILD_PLUGINS_STATIC)

3
src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt

@ -66,6 +66,9 @@ corrade_add_test(ObjImporterTest ObjImporterTest.cpp
target_include_directories(ObjImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
if(BUILD_PLUGINS_STATIC)
target_link_libraries(ObjImporterTest PRIVATE ObjImporter)
else()
# So the plugins get properly built when building the test
add_dependencies(ObjImporterTest ObjImporter)
endif()
set_target_properties(ObjImporterTest PROPERTIES FOLDER "MagnumPlugins/ObjImporter/Test")
if(CORRADE_BUILD_STATIC AND NOT BUILD_PLUGINS_STATIC)

6
src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt

@ -48,6 +48,12 @@ if(BUILD_PLUGINS_STATIC)
if(WITH_TGAIMPORTER)
target_link_libraries(TgaImageConverterTest PRIVATE TgaImporter)
endif()
else()
# So the plugins get properly built when building the test
add_dependencies(TgaImageConverterTest TgaImageConverter)
if(WITH_TGAIMPORTER)
add_dependencies(TgaImageConverterTest TgaImporter)
endif()
endif()
set_target_properties(TgaImageConverterTest PROPERTIES FOLDER "MagnumPlugins/TgaImageConverter/Test")
if(CORRADE_BUILD_STATIC AND NOT BUILD_PLUGINS_STATIC)

3
src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt

@ -49,6 +49,9 @@ corrade_add_test(TgaImporterTest TgaImporterTest.cpp
target_include_directories(TgaImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
if(BUILD_PLUGINS_STATIC)
target_link_libraries(TgaImporterTest PRIVATE TgaImporter)
else()
# So the plugins get properly built when building the test
add_dependencies(TgaImporterTest TgaImporter)
endif()
set_target_properties(TgaImporterTest PROPERTIES FOLDER "MagnumPlugins/TgaImporter/Test")
if(CORRADE_BUILD_STATIC AND NOT BUILD_PLUGINS_STATIC)

3
src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt

@ -96,6 +96,9 @@ corrade_add_test(WavAudioImporterTest WavImporterTest.cpp
target_include_directories(WavAudioImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
if(BUILD_PLUGINS_STATIC)
target_link_libraries(WavAudioImporterTest PRIVATE WavAudioImporter)
else()
# So the plugins get properly built when building the test
add_dependencies(WavAudioImporterTest WavAudioImporter)
endif()
corrade_add_test(WavAudioImporterWavHeaderTest
WavHeaderTest.cpp

Loading…
Cancel
Save