From 428e54f52a4a25b3527fcce585281b8fc698b62b Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Sat, 16 Nov 2019 14:07:09 +0100 Subject: [PATCH] simplified option to deactivate XITS fonts (no longer creates preprocessor symbols, as they were not used anywhere) --- CMakeLists.txt | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b801eca6d9..0879e72b4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,25 +82,12 @@ if(MSVC) # To fix error: C2338: va_start argument must not # have reference type and must not be parenthesized add_definitions(/D_CRT_NO_VA_START_VALIDATION) - if(BUILD_INCLUDE_XITS_FONTS) - add_definitions(/DAUTOLOAD_XITS_FONTS) - add_definitions(/DUSE_XITS_FONTS ) - else() - add_definitions(/DNO_XITS_FONTS ) - endif() - set(CMAKE_MSVCIDE_RUN_PATH ${CMAKE_PREFIX_PATH};${Qt5_DIR}/bin) + set(CMAKE_MSVCIDE_RUN_PATH ${CMAKE_PREFIX_PATH};${Qt5_DIR}/bin) else() add_compile_options(-fexceptions) if(BUILD_HIGH_COMPILE_WARNING_LEVEL) add_compile_options(-Wall -Wextra) # -Wimplicit-fallthrough -Wuninitialized -Wmaybe-uninitialized) # -Wmisleading-indentation -Weffc++) endif(BUILD_HIGH_COMPILE_WARNING_LEVEL) - - if(BUILD_INCLUDE_XITS_FONTS) - add_definitions(-DAUTOLOAD_XITS_FONTS) - add_definitions(-DUSE_XITS_FONTS ) - else() - add_definitions(-DNO_XITS_FONTS ) - endif() endif() if(BUILD_DECORATE_LIBNAMES_WITH_BUILDTYPE)