← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to .pc/0001-blender_thumbnailer.patch/source/creator/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/0001-blender_thumbnailer.patch/source/creator/CMakeLists.txt
234
234
        ${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
235
235
        ${CMAKE_SOURCE_DIR}/release/text/copyright.txt
236
236
        ${CMAKE_SOURCE_DIR}/release/text/readme.html
 
237
        ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bfont.ttf.txt
237
238
)
238
239
 
 
240
if(WITH_INTERNATIONAL)
 
241
        list(APPEND BLENDER_TEXT_FILES
 
242
                ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-droidsans.ttf.txt
 
243
                ${CMAKE_SOURCE_DIR}/release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
 
244
        )
 
245
endif()
 
246
 
239
247
 
240
248
# -----------------------------------------------------------------------------
241
249
# Platform Specific Var: TARGETDIR_VER
992
1000
                list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
993
1001
        endif()
994
1002
 
 
1003
        if(WITH_INPUT_NDOF)
 
1004
                list(APPEND BLENDER_SORTED_LIBS bf_intern_ghostndof3dconnexion)
 
1005
        endif()
 
1006
        
995
1007
        if(WITH_MOD_BOOLEAN)
996
1008
                list(APPEND BLENDER_SORTED_LIBS extern_carve)
997
1009
        endif()