diff --git a/src/Magnum/DebugTools/Test/CMakeLists.txt b/src/Magnum/DebugTools/Test/CMakeLists.txt index 11af44ab2..cd6e1d3de 100644 --- a/src/Magnum/DebugTools/Test/CMakeLists.txt +++ b/src/Magnum/DebugTools/Test/CMakeLists.txt @@ -40,7 +40,7 @@ if(WITH_TRADE) # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since # Corrade doesn't support dynamic plugins on iOS, this sorta works around - # that. Should be revisited when updating Travis to newer Xcode (current + # that. Should be revisited when updating Travis to newer Xcode (xcode7.3 # has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) @@ -55,17 +55,14 @@ if(WITH_TRADE) if(WITH_TGAIMAGECONVERTER) set(TGAIMAGECONVERTER_PLUGIN_FILENAME $) endif() - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() + # First replace ${} variables, then $<> generator expressions + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(DebugToolsCompareImageTest CompareImageTest.cpp LIBRARIES MagnumDebugToolsTestLib FILES @@ -73,10 +70,8 @@ if(WITH_TRADE) CompareImageExpected.tga CompareImageCompressed.dds) set_target_properties(DebugToolsCompareImageTest PROPERTIES FOLDER "Magnum/DebugTools/Test") - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(DebugToolsCompareImageTest PRIVATE $) - else() - target_include_directories(DebugToolsCompareImageTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(DebugToolsCompareImageTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGECONVERTER) target_link_libraries(DebugToolsCompareImageTest PRIVATE AnyImageConverter) endif() @@ -113,10 +108,8 @@ if(TARGET_GL) set_target_properties(DebugToolsScreenshotGLTest PROPERTIES FOLDER "Magnum/DebugTools/Test") # The configure.h file is provided for DebugToolsCompareImageTest # already - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(DebugToolsScreenshotGLTest PRIVATE $) - else() - target_include_directories(DebugToolsScreenshotGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(DebugToolsScreenshotGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGECONVERTER) target_link_libraries(DebugToolsScreenshotGLTest PRIVATE AnyImageConverter) endif() @@ -143,12 +136,9 @@ if(TARGET_GL) DebugToolsForceRendererGLTest DebugToolsObjectRendererGLTest PROPERTIES FOLDER "Magnum/DebugTools/Test") - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(DebugToolsForceRendererGLTest PRIVATE $) - target_include_directories(DebugToolsObjectRendererGLTest PRIVATE $) - else() - target_include_directories(DebugToolsForceRendererGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) - target_include_directories(DebugToolsObjectRendererGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(DebugToolsForceRendererGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + target_include_directories(DebugToolsObjectRendererGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) target_link_libraries(DebugToolsForceRendererGLTest PRIVATE AnyImageImporter) target_link_libraries(DebugToolsObjectRendererGLTest PRIVATE AnyImageImporter) diff --git a/src/Magnum/MeshTools/Test/CMakeLists.txt b/src/Magnum/MeshTools/Test/CMakeLists.txt index 32bb7afa6..10e54e114 100644 --- a/src/Magnum/MeshTools/Test/CMakeLists.txt +++ b/src/Magnum/MeshTools/Test/CMakeLists.txt @@ -77,7 +77,7 @@ if(BUILD_GL_TESTS) # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since # Corrade doesn't support dynamic plugins on iOS, this sorta works around - # that. Should be revisited when updating Travis to newer Xcode (current + # that. Should be revisited when updating Travis to newer Xcode (xcode7.3 # has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) @@ -86,17 +86,14 @@ if(BUILD_GL_TESTS) if(WITH_TGAIMPORTER) set(TGAIMPORTER_PLUGIN_FILENAME $) endif() - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() + # First replace ${} variables, then $<> generator expressions + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(MeshToolsCompileGLTest CompileGLTest.cpp LIBRARIES MagnumDebugTools @@ -114,10 +111,8 @@ if(BUILD_GL_TESTS) CompileTestFiles/textured2D.tga CompileTestFiles/textured3D.tga) set_target_properties(MeshToolsCompileGLTest PROPERTIES FOLDER "Magnum/MeshTools/Test") - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(MeshToolsCompileGLTest PRIVATE $) - else() - target_include_directories(MeshToolsCompileGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(MeshToolsCompileGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) target_link_libraries(MeshToolsCompileGLTest PRIVATE AnyImageImporter) endif() diff --git a/src/Magnum/Shaders/Test/CMakeLists.txt b/src/Magnum/Shaders/Test/CMakeLists.txt index 6b3f439a3..7978bc9be 100644 --- a/src/Magnum/Shaders/Test/CMakeLists.txt +++ b/src/Magnum/Shaders/Test/CMakeLists.txt @@ -52,7 +52,7 @@ if(BUILD_GL_TESTS) # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since # Corrade doesn't support dynamic plugins on iOS, this sorta works around - # that. Should be revisited when updating Travis to newer Xcode (current + # that. Should be revisited when updating Travis to newer Xcode (xcode7.3 # has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) @@ -61,17 +61,14 @@ if(BUILD_GL_TESTS) if(WITH_TGAIMPORTER) set(TGAIMPORTER_PLUGIN_FILENAME $) endif() - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() + # First replace ${} variables, then $<> generator expressions + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(ShadersDistanceFieldVectorGLTest DistanceFieldVectorGLTest.cpp LIBRARIES MagnumDebugTools @@ -90,10 +87,8 @@ if(BUILD_GL_TESTS) VectorTestFiles/smooth0.2-3D.tga VectorTestFiles/outline2D.tga VectorTestFiles/outline3D.tga) - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(ShadersDistanceFieldVectorGLTest PRIVATE $) - else() - target_include_directories(ShadersDistanceFieldVectorGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(ShadersDistanceFieldVectorGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) target_link_libraries(ShadersDistanceFieldVectorGLTest PRIVATE AnyImageImporter) endif() @@ -125,10 +120,8 @@ if(BUILD_GL_TESTS) FlatTestFiles/textured3D-alpha-mask0.5.tga FlatTestFiles/vertexColor2D.tga FlatTestFiles/vertexColor3D.tga) - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(ShadersFlatGLTest PRIVATE $) - else() - target_include_directories(ShadersFlatGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(ShadersFlatGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) target_link_libraries(ShadersFlatGLTest PRIVATE AnyImageImporter) endif() @@ -151,10 +144,8 @@ if(BUILD_GL_TESTS) MeshVisualizerTestFiles/wireframe.tga MeshVisualizerTestFiles/wireframe-nogeo.tga MeshVisualizerTestFiles/wireframe-wide.tga) - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(ShadersMeshVisualizerGLTest PRIVATE $) - else() - target_include_directories(ShadersMeshVisualizerGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(ShadersMeshVisualizerGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) target_link_libraries(ShadersMeshVisualizerGLTest PRIVATE AnyImageImporter) endif() @@ -198,10 +189,8 @@ if(BUILD_GL_TESTS) # For zero lights test (equivalency to Flat3D) FlatTestFiles/textured3D-alpha-mask0.5.tga) - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(ShadersPhongGLTest PRIVATE $) - else() - target_include_directories(ShadersPhongGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(ShadersPhongGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) target_link_libraries(ShadersPhongGLTest PRIVATE AnyImageImporter) endif() @@ -223,10 +212,8 @@ if(BUILD_GL_TESTS) VectorTestFiles/defaults.tga VectorTestFiles/vector2D.tga VectorTestFiles/vector3D.tga) - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(ShadersVectorGLTest PRIVATE $) - else() - target_include_directories(ShadersVectorGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(ShadersVectorGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) target_link_libraries(ShadersVectorGLTest PRIVATE AnyImageImporter) endif() @@ -247,10 +234,8 @@ if(BUILD_GL_TESTS) VertexColorTestFiles/vertexColor2D.tga VertexColorTestFiles/vertexColor3D.tga) - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(ShadersVertexColorGLTest PRIVATE $) - else() - target_include_directories(ShadersVertexColorGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(ShadersVertexColorGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) target_link_libraries(ShadersVertexColorGLTest PRIVATE AnyImageImporter) endif() diff --git a/src/Magnum/TextureTools/Test/CMakeLists.txt b/src/Magnum/TextureTools/Test/CMakeLists.txt index 431294f01..ff08ae09d 100644 --- a/src/Magnum/TextureTools/Test/CMakeLists.txt +++ b/src/Magnum/TextureTools/Test/CMakeLists.txt @@ -39,7 +39,7 @@ if(BUILD_GL_TESTS) # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since # Corrade doesn't support dynamic plugins on iOS, this sorta works around - # that. Should be revisited when updating Travis to newer Xcode (current + # that. Should be revisited when updating Travis to newer Xcode (xcode7.3 # has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) @@ -48,17 +48,14 @@ if(BUILD_GL_TESTS) if(WITH_TGAIMPORTER) set(TGAIMPORTER_PLUGIN_FILENAME $) endif() - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() + # First replace ${} variables, then $<> generator expressions + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + set(TextureToolsDistanceFieldGLTest_SRCS DistanceFieldGLTest.cpp) if(CORRADE_TARGET_IOS) # TODO: do this in a generic way in corrade_add_test() @@ -72,10 +69,8 @@ if(BUILD_GL_TESTS) DistanceFieldGLTestFiles/input.tga DistanceFieldGLTestFiles/output.tga) set_target_properties(TextureToolsDistanceFieldGLTest PROPERTIES FOLDER "Magnum/TextureTools/Test") - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(TextureToolsDistanceFieldGLTest PRIVATE $) - else() - target_include_directories(TextureToolsDistanceFieldGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(TextureToolsDistanceFieldGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) if(WITH_ANYIMAGEIMPORTER) target_link_libraries(TextureToolsDistanceFieldGLTest PRIVATE AnyImageImporter) endif() diff --git a/src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt b/src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt index 696ee79f9..3ece4582b 100644 --- a/src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt @@ -32,31 +32,26 @@ endif() # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since Corrade # doesn't support dynamic plugins on iOS, this sorta works around that. Should -# be revisited when updating Travis to newer Xcode (current has CMake 3.6). +# be revisited when updating Travis to newer Xcode (xcode7.3 has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) set(ANYAUDIOIMPORTER_PLUGIN_FILENAME $) if(WITH_WAVAUDIOIMPORTER) set(WAVAUDIOIMPORTER_PLUGIN_FILENAME $) endif() - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() +# First replace ${} variables, then $<> generator expressions +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(AnyAudioImporterTest AnyAudioImporterTest.cpp LIBRARIES MagnumAudio FILES ../../WavAudioImporter/Test/stereo8.wav) -if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(AnyAudioImporterTest PRIVATE $) -else() - target_include_directories(AnyAudioImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(AnyAudioImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) +if(BUILD_PLUGINS_STATIC) target_link_libraries(AnyAudioImporterTest PRIVATE AnyAudioImporter) if(WITH_WAVAUDIOIMPORTER) target_link_libraries(AnyAudioImporterTest PRIVATE WavAudioImporter) diff --git a/src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt b/src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt index 297911110..78a470b72 100644 --- a/src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt @@ -32,29 +32,24 @@ endif() # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since Corrade # doesn't support dynamic plugins on iOS, this sorta works around that. Should -# be revisited when updating Travis to newer Xcode (current has CMake 3.6). +# be revisited when updating Travis to newer Xcode (xcode7.3 has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) set(ANYIMAGECONVERTER_PLUGIN_FILENAME $) if(WITH_TGAIMAGECONVERTER) set(TGAIMAGECONVERTER_PLUGIN_FILENAME $) endif() - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() +# First replace ${} variables, then $<> generator expressions +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(AnyImageConverterTest AnyImageConverterTest.cpp LIBRARIES MagnumTrade) -if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(AnyImageConverterTest PRIVATE $) -else() - target_include_directories(AnyImageConverterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(AnyImageConverterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) +if(BUILD_PLUGINS_STATIC) target_link_libraries(AnyImageConverterTest PRIVATE AnyImageConverter) if(WITH_TGAIMAGECONVERTER) target_link_libraries(AnyImageConverterTest PRIVATE TgaImageConverter) diff --git a/src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt b/src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt index 2c4f57014..aa7fefe00 100644 --- a/src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt @@ -34,23 +34,20 @@ endif() # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since Corrade # doesn't support dynamic plugins on iOS, this sorta works around that. Should -# be revisited when updating Travis to newer Xcode (current has CMake 3.6). +# be revisited when updating Travis to newer Xcode (xcode7.3 has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) set(ANYIMAGEIMPORTER_PLUGIN_FILENAME $) if(WITH_TGAIMPORTER) set(TGAIMPORTER_PLUGIN_FILENAME $) endif() - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() +# First replace ${} variables, then $<> generator expressions +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(AnyImageImporterTest AnyImageImporterTest.cpp LIBRARIES MagnumTrade FILES @@ -61,10 +58,8 @@ corrade_add_test(AnyImageImporterTest AnyImageImporterTest.cpp rgb.png rgba_dxt1.dds ../../TgaImporter/Test/file.tga) -if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(AnyImageImporterTest PRIVATE $) -else() - target_include_directories(AnyImageImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(AnyImageImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) +if(BUILD_PLUGINS_STATIC) target_link_libraries(AnyImageImporterTest PRIVATE AnyImageImporter) if(WITH_TGAIMPORTER) target_link_libraries(AnyImageImporterTest PRIVATE TgaImporter) diff --git a/src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt b/src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt index 65dfb9264..5462c7219 100644 --- a/src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt @@ -32,31 +32,26 @@ endif() # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since Corrade # doesn't support dynamic plugins on iOS, this sorta works around that. Should -# be revisited when updating Travis to newer Xcode (current has CMake 3.6). +# be revisited when updating Travis to newer Xcode (xcode7.3 has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) set(ANYSCENEIMPORTER_PLUGIN_FILENAME $) if(WITH_OBJIMPORTER) set(OBJIMPORTER_PLUGIN_FILENAME $) endif() - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() +# First replace ${} variables, then $<> generator expressions +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(AnySceneImporterTest AnySceneImporterTest.cpp LIBRARIES MagnumTrade FILES ../../ObjImporter/Test/pointMesh.obj) -if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(AnySceneImporterTest PRIVATE $) -else() - target_include_directories(AnySceneImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(AnySceneImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) +if(BUILD_PLUGINS_STATIC) target_link_libraries(AnySceneImporterTest PRIVATE AnySceneImporter) if(WITH_OBJIMPORTER) target_link_libraries(AnySceneImporterTest PRIVATE ObjImporter) diff --git a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt index 6edf2072c..0a88aa35a 100644 --- a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt @@ -32,30 +32,25 @@ endif() # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since Corrade # doesn't support dynamic plugins on iOS, this sorta works around that. Should -# be revisited when updating Travis to newer Xcode (current has CMake 3.6). +# be revisited when updating Travis to newer Xcode (xcode7.3 has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) set(MAGNUMFONT_PLUGIN_FILENAME $) set(TGAIMPORTER_PLUGIN_FILENAME $) - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() +# First replace ${} variables, then $<> generator expressions +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(MagnumFontTest MagnumFontTest.cpp LIBRARIES MagnumText MagnumTrade FILES font.conf font.tga) -if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(MagnumFontTest PRIVATE $) -else() - target_include_directories(MagnumFontTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(MagnumFontTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) +if(BUILD_PLUGINS_STATIC) target_link_libraries(MagnumFontTest PRIVATE MagnumFont TgaImporter) endif() set_target_properties(MagnumFontTest PROPERTIES FOLDER "MagnumPlugins/MagnumFont/Test") @@ -66,10 +61,8 @@ if(BUILD_GL_TESTS) FILES font.conf font.tga) - if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(MagnumFontGLTest PRIVATE $) - else() - target_include_directories(MagnumFontGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) + target_include_directories(MagnumFontGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) + if(BUILD_PLUGINS_STATIC) target_link_libraries(MagnumFontGLTest PRIVATE MagnumFont TgaImporter) endif() set_target_properties(MagnumFontGLTest PROPERTIES FOLDER "MagnumPlugins/MagnumFont/Test") diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt index e9a9e04be..5ccdea3cc 100644 --- a/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt @@ -26,30 +26,25 @@ # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since Corrade # doesn't support dynamic plugins on iOS, this sorta works around that. Should -# be revisited when updating Travis to newer Xcode (current has CMake 3.6). +# be revisited when updating Travis to newer Xcode (xcode7.3 has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) set(MAGNUMFONTCONVERTER_PLUGIN_FILENAME $) set(TGAIMAGECONVERTER_PLUGIN_FILENAME $) if(WITH_TGAIMPORTER) set(TGAIMPORTER_PLUGIN_FILENAME $) endif() - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() +# First replace ${} variables, then $<> generator expressions +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(MagnumFontConverterTest MagnumFontConverterTest.cpp LIBRARIES MagnumText MagnumTrade) -if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(MagnumFontConverterTest PRIVATE $) -else() - target_include_directories(MagnumFontConverterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(MagnumFontConverterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) +if(BUILD_PLUGINS_STATIC) target_link_libraries(MagnumFontConverterTest PRIVATE MagnumFontConverter) # TgaImageConverter should get linked transitively if(WITH_TGAIMPORTER) diff --git a/src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt b/src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt index 04ebbc45b..ada5fb3de 100644 --- a/src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt @@ -32,20 +32,17 @@ endif() # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since Corrade # doesn't support dynamic plugins on iOS, this sorta works around that. Should -# be revisited when updating Travis to newer Xcode (current has CMake 3.6). +# be revisited when updating Travis to newer Xcode (xcode7.3 has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) set(OBJIMPORTER_PLUGIN_FILENAME $) - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() +# First replace ${} variables, then $<> generator expressions +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(ObjImporterTest ObjImporterTest.cpp LIBRARIES MagnumTrade FILES @@ -66,10 +63,8 @@ corrade_add_test(ObjImporterTest ObjImporterTest.cpp wrongIndexCount.obj wrongNumberCount.obj wrongNumbers.obj) -if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(ObjImporterTest PRIVATE $) -else() - target_include_directories(ObjImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(ObjImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) +if(BUILD_PLUGINS_STATIC) target_link_libraries(ObjImporterTest PRIVATE ObjImporter) endif() set_target_properties(ObjImporterTest PROPERTIES FOLDER "MagnumPlugins/ObjImporter/Test") diff --git a/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt index 58faf0dcb..a6126f8d1 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt @@ -26,29 +26,24 @@ # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since Corrade # doesn't support dynamic plugins on iOS, this sorta works around that. Should -# be revisited when updating Travis to newer Xcode (current has CMake 3.6). +# be revisited when updating Travis to newer Xcode (xcode7.3 has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) set(TGAIMAGECONVERTER_PLUGIN_FILENAME $) if(WITH_TGAIMPORTER) set(TGAIMPORTER_PLUGIN_FILENAME $) endif() - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() +# First replace ${} variables, then $<> generator expressions +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(TgaImageConverterTest TgaImageConverterTest.cpp LIBRARIES MagnumTrade) -if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(TgaImageConverterTest PRIVATE $) -else() - target_include_directories(TgaImageConverterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(TgaImageConverterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) +if(BUILD_PLUGINS_STATIC) target_link_libraries(TgaImageConverterTest PRIVATE TgaImageConverter) if(WITH_TGAIMPORTER) target_link_libraries(TgaImageConverterTest PRIVATE TgaImporter) diff --git a/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt index 23f1c6c8f..e7bf23cea 100644 --- a/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt @@ -32,27 +32,22 @@ endif() # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since Corrade # doesn't support dynamic plugins on iOS, this sorta works around that. Should -# be revisited when updating Travis to newer Xcode (current has CMake 3.6). +# be revisited when updating Travis to newer Xcode (xcode7.3 has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) set(TGAIMPORTER_PLUGIN_FILENAME $) - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() +# First replace ${} variables, then $<> generator expressions +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(TgaImporterTest TgaImporterTest.cpp LIBRARIES MagnumTrade FILES file.tga) -if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(TgaImporterTest PRIVATE $) -else() - target_include_directories(TgaImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(TgaImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) +if(BUILD_PLUGINS_STATIC) target_link_libraries(TgaImporterTest PRIVATE TgaImporter) endif() set_target_properties(TgaImporterTest PROPERTIES FOLDER "MagnumPlugins/TgaImporter/Test") diff --git a/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt index 9de404f6a..a3684768d 100644 --- a/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt @@ -32,20 +32,17 @@ endif() # CMake before 3.8 has broken $ expressions for iOS (see # https://gitlab.kitware.com/cmake/cmake/merge_requests/404) and since Corrade # doesn't support dynamic plugins on iOS, this sorta works around that. Should -# be revisited when updating Travis to newer Xcode (current has CMake 3.6). +# be revisited when updating Travis to newer Xcode (xcode7.3 has CMake 3.6). if(NOT BUILD_PLUGINS_STATIC) set(WAVAUDIOIMPORTER_PLUGIN_FILENAME $) - - # First replace ${} variables, then $<> generator expressions - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) - file(GENERATE OUTPUT $/configure.h - INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) -else() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) endif() +# First replace ${} variables, then $<> generator expressions +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) +file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$/configure.h + INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in) + corrade_add_test(WavAudioImporterTest WavImporterTest.cpp LIBRARIES MagnumAudio FILES @@ -83,10 +80,8 @@ corrade_add_test(WavAudioImporterTest WavImporterTest.cpp surround51Channel16.wav surround71Channel24.wav) -if(NOT BUILD_PLUGINS_STATIC) - target_include_directories(WavAudioImporterTest PRIVATE $) -else() - target_include_directories(WavAudioImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(WavAudioImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$) +if(BUILD_PLUGINS_STATIC) target_link_libraries(WavAudioImporterTest PRIVATE WavAudioImporter) endif()