Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix error after recent change when WITH_INTERNATIONAL=OFF

Browse Source 
Always need to install font files now.
This commit is contained in:
Brecht Van Lommel
2020-03-25 18:43:39 +01:00
parent 59aaba739d
commit d751491489
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/creator/CMakeLists.txt
View File

@@ -304,12 +304,10 @@ if(WITH_MEM_JEMALLOC)
) )
endif() endif()
if(WITH_INTERNATIONAL) list(APPEND BLENDER_TEXT_FILES
list(APPEND BLENDER_TEXT_FILES ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt )
)
endif()
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -387,14 +385,15 @@ if(WITH_PYTHON)
unset(FREESTYLE_EXCLUDE_CONDITIONAL) unset(FREESTYLE_EXCLUDE_CONDITIONAL)
endif() endif()
# fonts
install(
DIRECTORY
${CMAKE_SOURCE_DIR}/release/datafiles/fonts
DESTINATION ${TARGETDIR_VER}/datafiles
)
# localization # localization
if(WITH_INTERNATIONAL) 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_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
set(_locale_target_dir ${TARGETDIR_VER}/datafiles/locale) set(_locale_target_dir ${TARGETDIR_VER}/datafiles/locale)