From bf4d47d969c642e1446374a4d3a12e9c8cd59026 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Sun, 14 Jun 2020 13:49:22 +0200 Subject: [PATCH] [FREETYPE] CMakeLists.txt: Fix if conditions --- sdk/lib/3rdparty/freetype/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk/lib/3rdparty/freetype/CMakeLists.txt b/sdk/lib/3rdparty/freetype/CMakeLists.txt index e2d7b3108ca..bac1f0bb249 100644 --- a/sdk/lib/3rdparty/freetype/CMakeLists.txt +++ b/sdk/lib/3rdparty/freetype/CMakeLists.txt @@ -55,11 +55,9 @@ list(APPEND SOURCE add_library(freetype ${SOURCE}) -if (MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND ARCH STREQUAL "amd64") # error C4312: 'type cast': conversion from 'unsigned long' to 'void *' of greater size remove_target_compile_option(freetype "/we4312") elseif(GCC) target_compile_options(freetype PRIVATE -fno-builtin-malloc) -elseif(CLANG) - target_compile_options(freetype PRIVATE -Wno-tautological-constant-compare) endif()