diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt index 2fabf1fd70..b4c0433bc7 100644 --- a/3party/CMakeLists.txt +++ b/3party/CMakeLists.txt @@ -1,3 +1,7 @@ +# Fixes CMake deprecation warning: +# Compatibility with CMake < 3.5 will be removed from a future version of CMake. +set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE) + if (NOT WITH_SYSTEM_PROVIDED_3PARTY) # Configure expat library. # Suppress "Policy CMP0077 is not set: option() honors normal variables" diff --git a/3party/freetype/CMakeLists.txt b/3party/freetype/CMakeLists.txt index 47de0e4707..60c55eda8b 100644 --- a/3party/freetype/CMakeLists.txt +++ b/3party/freetype/CMakeLists.txt @@ -2,6 +2,9 @@ set(FT_DISABLE_HARFBUZZ ON) add_subdirectory(freetype) +# Fix warning with ONE_PIXEL macro clash. +target_compile_options(freetype PRIVATE -Wno-macro-redefined) + # Use ft2build.h from the current directory instead of the default. target_include_directories(freetype BEFORE PUBLIC @@ -10,3 +13,4 @@ target_include_directories(freetype ) add_library(Freetype::Freetype ALIAS freetype) +