Cycles: svn merge -r41157:41182 ^/trunk/blender
[blender.git] / source / creator / CMakeLists.txt
index 51297f57e9d00f030d13818dc8e09a0c9ac40963..6e3c486e788868b9efdb889b2f575054c006dc79 100644 (file)
@@ -344,16 +344,11 @@ if(UNIX AND NOT APPLE)
                )
        endif()
 
-       install(
-               FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
-               DESTINATION ${TARGETDIR_VER}
-       )
-
        if(WITH_INTERNATIONAL)
                install(
                        DIRECTORY
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/locale
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
                        DESTINATION ${TARGETDIR_VER}/datafiles
                        PATTERN ".svn" EXCLUDE
                )
@@ -416,16 +411,11 @@ elseif(WIN32)
                DESTINATION ${TARGETDIR}
        )
 
-       install(  # same as linux!, deduplicate
-               FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
-               DESTINATION ${TARGETDIR_VER}
-       )
-
        if(WITH_INTERNATIONAL) # same as linux!, deduplicate
                install(
                        DIRECTORY
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/locale
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
                        DESTINATION ${TARGETDIR_VER}/datafiles
                        PATTERN ".svn" EXCLUDE
                )
@@ -647,17 +637,12 @@ elseif(APPLE)
                \${TARGETDIR}/blender.app/Contents/
        )
 
-       install(
-               FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
-               DESTINATION ${TARGETDIR_VER}
-       )
-
        # localization
        if(WITH_INTERNATIONAL)
                install(
                        DIRECTORY
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
-                               ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/locale
+                               ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
                        DESTINATION ${TARGETDIR_VER}/datafiles
                        PATTERN ".svn" EXCLUDE
                )