[Bf-blender-cvs] [d7514914894] master: Fix error after recent change when WITH_INTERNATIONAL=OFF
Brecht Van Lommel
noreply at git.blender.org
Wed Mar 25 18:45:55 CET 2020
Commit: d7514914894e9c96c9eab21fb625a2021aaa71cb
Author: Brecht Van Lommel
Date: Wed Mar 25 18:43:39 2020 +0100
Branches: master
https://developer.blender.org/rBd7514914894e9c96c9eab21fb625a2021aaa71cb
Fix error after recent change when WITH_INTERNATIONAL=OFF
Always need to install font files now.
===================================================================
M source/creator/CMakeLists.txt
===================================================================
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)
More information about the Bf-blender-cvs
mailing list