From 06b5bae5c88f19960a0c37934f109c11110a7642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 2 Jul 2022 14:49:00 +0200 Subject: [PATCH] CMake: drop notes about old CMake on old Xcode Travis images. None of that is relevant anymore, especially given the broken feature affects something we don't even support. --- src/Magnum/DebugTools/Test/CMakeLists.txt | 5 ----- src/Magnum/GL/Test/CMakeLists.txt | 5 ----- src/Magnum/MeshTools/Test/CMakeLists.txt | 5 ----- src/Magnum/Shaders/Test/CMakeLists.txt | 5 ----- src/Magnum/TextureTools/Test/CMakeLists.txt | 5 ----- src/Magnum/Vk/Test/CMakeLists.txt | 5 ----- src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/AnySceneConverter/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/AnyShaderConverter/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt | 4 ---- src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt | 4 ---- 18 files changed, 78 deletions(-) diff --git a/src/Magnum/DebugTools/Test/CMakeLists.txt b/src/Magnum/DebugTools/Test/CMakeLists.txt index 02094a6c5..6e9e3db21 100644 --- a/src/Magnum/DebugTools/Test/CMakeLists.txt +++ b/src/Magnum/DebugTools/Test/CMakeLists.txt @@ -44,11 +44,6 @@ if(MAGNUM_WITH_TRADE) set(COMPAREIMAGETEST_SAVE_DIR ${CMAKE_CURRENT_BINARY_DIR}/write) 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 (xcode7.3 - # has CMake 3.6). if(NOT MAGNUM_BUILD_PLUGINS_STATIC) if(MAGNUM_WITH_ANYIMAGEIMPORTER) set(ANYIMAGEIMPORTER_PLUGIN_FILENAME $) diff --git a/src/Magnum/GL/Test/CMakeLists.txt b/src/Magnum/GL/Test/CMakeLists.txt index 6aeb80b08..29ba9d095 100644 --- a/src/Magnum/GL/Test/CMakeLists.txt +++ b/src/Magnum/GL/Test/CMakeLists.txt @@ -104,11 +104,6 @@ if(MAGNUM_BUILD_GL_TESTS) set(RENDERERGLTEST_FILES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/RendererGLTestFiles) 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 (xcode7.3 - # has CMake 3.6). if(NOT MAGNUM_BUILD_PLUGINS_STATIC) if(MAGNUM_WITH_ANYIMAGEIMPORTER) set(ANYIMAGEIMPORTER_PLUGIN_FILENAME $) diff --git a/src/Magnum/MeshTools/Test/CMakeLists.txt b/src/Magnum/MeshTools/Test/CMakeLists.txt index 1c2d37f82..5281f7976 100644 --- a/src/Magnum/MeshTools/Test/CMakeLists.txt +++ b/src/Magnum/MeshTools/Test/CMakeLists.txt @@ -75,11 +75,6 @@ if(MAGNUM_BUILD_GL_TESTS) set(MESHTOOLS_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 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 (xcode7.3 - # has CMake 3.6). if(NOT MAGNUM_BUILD_PLUGINS_STATIC) if(MAGNUM_WITH_ANYIMAGEIMPORTER) set(ANYIMAGEIMPORTER_PLUGIN_FILENAME $) diff --git a/src/Magnum/Shaders/Test/CMakeLists.txt b/src/Magnum/Shaders/Test/CMakeLists.txt index 1ba6d15b5..968adb16c 100644 --- a/src/Magnum/Shaders/Test/CMakeLists.txt +++ b/src/Magnum/Shaders/Test/CMakeLists.txt @@ -54,11 +54,6 @@ if(MAGNUM_BUILD_GL_TESTS) set(SHADERS_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 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 (xcode7.3 - # has CMake 3.6). if(NOT MAGNUM_BUILD_PLUGINS_STATIC) if(MAGNUM_WITH_ANYIMAGEIMPORTER) set(ANYIMAGEIMPORTER_PLUGIN_FILENAME $) diff --git a/src/Magnum/TextureTools/Test/CMakeLists.txt b/src/Magnum/TextureTools/Test/CMakeLists.txt index 8e20ebaa3..a6a007e7e 100644 --- a/src/Magnum/TextureTools/Test/CMakeLists.txt +++ b/src/Magnum/TextureTools/Test/CMakeLists.txt @@ -39,11 +39,6 @@ if(MAGNUM_BUILD_GL_TESTS) # Otherwise CMake complains that Corrade::PluginManager is not found, wtf find_package(Corrade REQUIRED PluginManager) - # 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 (xcode7.3 - # has CMake 3.6). if(NOT MAGNUM_BUILD_PLUGINS_STATIC) if(MAGNUM_WITH_ANYIMAGEIMPORTER) set(ANYIMAGEIMPORTER_PLUGIN_FILENAME $) diff --git a/src/Magnum/Vk/Test/CMakeLists.txt b/src/Magnum/Vk/Test/CMakeLists.txt index 492492f6d..9cdde0518 100644 --- a/src/Magnum/Vk/Test/CMakeLists.txt +++ b/src/Magnum/Vk/Test/CMakeLists.txt @@ -39,11 +39,6 @@ if(MAGNUM_BUILD_VK_TESTS) set(VK_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 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 (xcode7.3 - # has CMake 3.6). if(NOT MAGNUM_BUILD_PLUGINS_STATIC) if(MAGNUM_WITH_ANYIMAGEIMPORTER) set(ANYIMAGEIMPORTER_PLUGIN_FILENAME $) diff --git a/src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt b/src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt index 130ca3dfa..8767544cf 100644 --- a/src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/AnyAudioImporter/Test/CMakeLists.txt @@ -33,10 +33,6 @@ else() set(WAVAUDIOIMPORTER_TEST_DIR ${PROJECT_SOURCE_DIR}/src/MagnumPlugins/WavAudioImporter/Test) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_ANYAUDIOIMPORTER_BUILD_STATIC) set(ANYAUDIOIMPORTER_PLUGIN_FILENAME $) if(MAGNUM_WITH_WAVAUDIOIMPORTER) diff --git a/src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt b/src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt index ee4606a40..34f416f36 100644 --- a/src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/AnyImageConverter/Test/CMakeLists.txt @@ -40,10 +40,6 @@ else() set(ANYIMAGEIMPORTER_TEST_DIR ${PROJECT_SOURCE_DIR}/src/MagnumPlugins/AnyImageImporter/Test) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_ANYIMAGECONVERTER_BUILD_STATIC) set(ANYIMAGECONVERTER_PLUGIN_FILENAME $) if(MAGNUM_WITH_TGAIMAGECONVERTER) diff --git a/src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt b/src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt index af0706345..f6599c548 100644 --- a/src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt @@ -33,10 +33,6 @@ else() set(ANYIMAGEIMPORTER_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC) set(ANYIMAGEIMPORTER_PLUGIN_FILENAME $) if(MAGNUM_WITH_TGAIMPORTER) diff --git a/src/MagnumPlugins/AnySceneConverter/Test/CMakeLists.txt b/src/MagnumPlugins/AnySceneConverter/Test/CMakeLists.txt index f8db40c1f..7a5c7fbf8 100644 --- a/src/MagnumPlugins/AnySceneConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/AnySceneConverter/Test/CMakeLists.txt @@ -37,10 +37,6 @@ else() set(ANYSCENEIMPORTER_TEST_DIR ${PROJECT_SOURCE_DIR}/src/MagnumPlugins/AnySceneImporter/Test) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_ANYSCENECONVERTER_BUILD_STATIC) set(ANYSCENECONVERTER_PLUGIN_FILENAME $) if(MAGNUM_WITH_TGAIMAGECONVERTER) diff --git a/src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt b/src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt index 272fe208a..aba0c51ff 100644 --- a/src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/AnySceneImporter/Test/CMakeLists.txt @@ -35,10 +35,6 @@ else() set(OBJIMPORTER_TEST_DIR ${PROJECT_SOURCE_DIR}/src/MagnumPlugins/ObjImporter/Test) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_ANYSCENEIMPORTER_BUILD_STATIC) set(ANYSCENEIMPORTER_PLUGIN_FILENAME $) if(MAGNUM_WITH_OBJIMPORTER) diff --git a/src/MagnumPlugins/AnyShaderConverter/Test/CMakeLists.txt b/src/MagnumPlugins/AnyShaderConverter/Test/CMakeLists.txt index 8d0425c5e..abd44cddf 100644 --- a/src/MagnumPlugins/AnyShaderConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/AnyShaderConverter/Test/CMakeLists.txt @@ -35,10 +35,6 @@ else() set(ANYSHADERCONVERTER_TEST_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_ANYSHADERCONVERTER_BUILD_STATIC) set(ANYSHADERCONVERTER_PLUGIN_FILENAME $) endif() diff --git a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt index 6983d5415..4c6c3a904 100644 --- a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt @@ -33,10 +33,6 @@ else() set(MAGNUMFONT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_MAGNUMFONT_BUILD_STATIC) set(MAGNUMFONT_PLUGIN_FILENAME $) set(TGAIMPORTER_PLUGIN_FILENAME $) diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt index 2b52cc976..cecaa048b 100644 --- a/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt @@ -35,10 +35,6 @@ else() set(MAGNUMFONT_TEST_DIR ${PROJECT_SOURCE_DIR}/src/MagnumPlugins/MagnumFont/Test) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_MAGNUMFONTCONVERTER_BUILD_STATIC) set(MAGNUMFONTCONVERTER_PLUGIN_FILENAME $) set(TGAIMAGECONVERTER_PLUGIN_FILENAME $) diff --git a/src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt b/src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt index 2bd91f662..833f15a65 100644 --- a/src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt @@ -33,10 +33,6 @@ else() set(OBJIMPORTER_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_OBJIMPORTER_BUILD_STATIC) set(OBJIMPORTER_PLUGIN_FILENAME $) endif() diff --git a/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt index da4d4acf2..40e5c707e 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt @@ -27,10 +27,6 @@ # property that would have to be set on each target separately. set(CMAKE_FOLDER "MagnumPlugins/TgaImageConverter/Test") -# 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_TGAIMAGECONVERTER_BUILD_STATIC) set(TGAIMAGECONVERTER_PLUGIN_FILENAME $) if(MAGNUM_WITH_TGAIMPORTER) diff --git a/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt index f28f6f425..2dc529fd3 100644 --- a/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt @@ -33,10 +33,6 @@ else() set(TGAIMPORTER_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_TGAIMPORTER_BUILD_STATIC) set(TGAIMPORTER_PLUGIN_FILENAME $) endif() diff --git a/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt index 0204a028e..f1e46c78c 100644 --- a/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt @@ -33,10 +33,6 @@ else() set(WAVAUDIOIMPORTER_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}) 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 (xcode7.3 has CMake 3.6). if(NOT MAGNUM_WAVAUDIOIMPORTER_BUILD_STATIC) set(WAVAUDIOIMPORTER_PLUGIN_FILENAME $) endif()