diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-03-25 20:43:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-03-25 20:44:35 +0300 |
| commit | d7514914894e9c96c9eab21fb625a2021aaa71cb (patch) | |
| tree | 105ca4ab4fcd6e877d498897f45a9dd60a7948b8 /source/creator | |
| parent | 59aaba739dfa6103320ce1414dad120231493bfa (diff) | |
Fix error after recent change when WITH_INTERNATIONAL=OFF
Always need to install font files now.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 23 |
1 files changed, 11 insertions, 12 deletions
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) |