CMakeLists: disable deprecated stuff globally.

'Twas causing issues with Containers::Array vs Magnum::Array, the latter of which is deprecated.
Logger: remove semicolons from the macro definitions.
2022-04-29 22:19:13 +02:00 · 2022-04-29 19:37:07 +02:00
2 changed files with 5 additions and 9 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -29,11 +29,7 @@ set(WITH_INTERCONNECT ON CACHE BOOL "" FORCE)
 set(WITH_PLUGINMANAGER OFF CACHE BOOL "" FORCE)
 set(WITH_TESTSUITE OFF CACHE BOOL "" FORCE)
 set(WITH_MAIN ON CACHE BOOL "" FORCE)
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
-    set(BUILD_DEPRECATED ON CACHE BOOL "" FORCE)
-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-    set(BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
-endif()
+set(BUILD_DEPRECATED OFF CACHE BOOL "" FORCE)
 set(UTILITY_USE_ANSI_COLORS ON CACHE BOOL "" FORCE)
 add_subdirectory(third-party/corrade EXCLUDE_FROM_ALL)

--- a/src/Logger/Logger.h
+++ b/src/Logger/Logger.h
@ -61,13 +61,13 @@ bool tryLockMutex();

 #define LOG_INFO(message) MassBuilderSaveTool::Logger::lockMutex(); \
                          MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Info, message); \
-                          MassBuilderSaveTool::Logger::unlockMutex();
+                          MassBuilderSaveTool::Logger::unlockMutex()
 #define LOG_SUCCESS(message) MassBuilderSaveTool::Logger::lockMutex(); \
                          MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Success, message); \
-                          MassBuilderSaveTool::Logger::unlockMutex();
+                          MassBuilderSaveTool::Logger::unlockMutex()
 #define LOG_WARNING(message) MassBuilderSaveTool::Logger::lockMutex(); \
                          MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Warning, message); \
-                          MassBuilderSaveTool::Logger::unlockMutex();
+                          MassBuilderSaveTool::Logger::unlockMutex()
 #define LOG_ERROR(message) MassBuilderSaveTool::Logger::lockMutex(); \
                          MassBuilderSaveTool::Logger::addEntry(MassBuilderSaveTool::Logger::EntryType::Error, message); \
-                          MassBuilderSaveTool::Logger::unlockMutex();
+                          MassBuilderSaveTool::Logger::unlockMutex()