simplified option to deactivate XITS fonts (no longer creates preprocessor symbols, as they were not used anywhere)

This commit is contained in:
jkriege2 2019-11-16 14:07:09 +01:00
parent ef482042db
commit 428e54f52a

View File

@ -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)