Revision: 37725
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37725
Author:   campbellbarton
Date:     2011-06-22 08:43:01 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
cmake was installing .bfont.ttf in ~/.blender/VER/config, use ~/.blender/VER 
instead (as with scons)

Modified Paths:
--------------
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-06-22 06:03:05 UTC (rev 
37724)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-06-22 08:43:01 UTC (rev 
37725)
@@ -340,13 +340,13 @@
 
        install(
                FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
-               DESTINATION ${TARGETDIR_VER}/config
+               DESTINATION ${TARGETDIR_VER}
        )
 
        if(WITH_INTERNATIONAL)
                install(
                        FILES 
${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
-                       DESTINATION ${TARGETDIR_VER}/config
+                       DESTINATION ${TARGETDIR_VER}
                )
 
                install(
@@ -416,13 +416,13 @@
 
        install(  # same as linux!, deduplicate
                FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
-               DESTINATION ${TARGETDIR_VER}/config
+               DESTINATION ${TARGETDIR_VER}
        )
 
        if(WITH_INTERNATIONAL) # same as linux!, deduplicate
                install(
                        FILES 
${CMAKE_SOURCE_DIR}/release/bin/.blender/.Blanguages
-                       DESTINATION ${TARGETDIR_VER}/config
+                       DESTINATION ${TARGETDIR_VER}
                )
                install(
                        DIRECTORY 
${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
@@ -647,7 +647,7 @@
 
        install(
                FILES ${CMAKE_SOURCE_DIR}/release/bin/.blender/.bfont.ttf
-               DESTINATION ${TARGETDIR_VER}/datafiles
+               DESTINATION ${TARGETDIR_VER}
        )
 
        # localization

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to