From d7514914894e9c96c9eab21fb625a2021aaa71cb Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 25 Mar 2020 18:43:39 +0100 Subject: Fix error after recent change when WITH_INTERNATIONAL=OFF Always need to install font files now. --- source/creator/CMakeLists.txt | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'source/creator') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index bbef3a4d52a..720e26b24e2 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -304,12 +304,10 @@ if(WITH_MEM_JEMALLOC) ) endif() -if(WITH_INTERNATIONAL) - list(APPEND BLENDER_TEXT_FILES - ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt - ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt - ) -endif() +list(APPEND BLENDER_TEXT_FILES + ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt + ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt +) # ----------------------------------------------------------------------------- @@ -387,14 +385,15 @@ if(WITH_PYTHON) unset(FREESTYLE_EXCLUDE_CONDITIONAL) endif() +# fonts +install( + DIRECTORY + ${CMAKE_SOURCE_DIR}/release/datafiles/fonts + DESTINATION ${TARGETDIR_VER}/datafiles +) + # localization if(WITH_INTERNATIONAL) - install( - DIRECTORY - ${CMAKE_SOURCE_DIR}/release/datafiles/fonts - DESTINATION ${TARGETDIR_VER}/datafiles - ) - set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale") set(_locale_target_dir ${TARGETDIR_VER}/datafiles/locale) -- cgit v1.2.3