diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 14:43:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 14:43:25 +0400 |
| commit | 460cde345bd7779f7dc011b7154c7497be46d799 (patch) | |
| tree | 36e29196b072abba9027327ac87cf881b03faa32 /source/creator | |
| parent | d92b5ea04ac8b661bb8caa7a1ca813e8f33a5a1c (diff) | |
| parent | f0aac81466bb5b3a935d74d3a35b545002b0451b (diff) | |
svn merge ^/trunk/blender -r40394:40395
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 22fe0a1a1d1..84e27f2a332 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -356,7 +356,9 @@ if(UNIX AND NOT APPLE) ) install( - DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale + DIRECTORY + ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale + ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) @@ -430,7 +432,9 @@ elseif(WIN32) DESTINATION ${TARGETDIR_VER} ) install( - DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale + DIRECTORY + ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale + ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) @@ -449,8 +453,10 @@ elseif(WIN32) endif() install( # same as linux!, deduplicate - DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale - DESTINATION ${TARGETDIR_VER}/datafiles/locale + DIRECTORY + ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale + ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts + DESTINATION ${TARGETDIR_VER}/datafiles PATTERN ".svn" EXCLUDE ) @@ -662,9 +668,12 @@ elseif(APPLE) DESTINATION ${TARGETDIR_VER}/datafiles ) - install_dir( - ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale/ - \${TARGETDIR_VER}/datafiles/locale + install( + DIRECTORY + ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts + ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale + DESTINATION ${TARGETDIR_VER}/datafiles + PATTERN ".svn" EXCLUDE ) endif() |