← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to .pc/0006-update_manpages.patch/source/creator/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/0006-update_manpages.patch/source/creator/CMakeLists.txt
80
80
        blender_include_dirs(${BINRELOC_INCLUDE_DIRS})
81
81
endif()
82
82
 
 
83
if(WITH_FREESTYLE)
 
84
        add_definitions(-DWITH_FREESTYLE)
 
85
        blender_include_dirs(../blender/freestyle)
 
86
endif()
 
87
 
83
88
# Setup the exe sources and buildinfo
84
89
set(SRC
85
90
        creator.c
277
282
                set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*")  # dummy, wont do anything
278
283
        endif()
279
284
 
 
285
        # do not install freestyle dir if disabled
 
286
        if(NOT WITH_FREESTYLE)
 
287
                set(FREESTYLE_EXCLUDE_CONDITIONAL "freestyle/*")
 
288
        else()
 
289
                set(FREESTYLE_EXCLUDE_CONDITIONAL "_freestyle/*")  # dummy, wont do anything
 
290
        endif()
 
291
 
280
292
        install(
281
293
                DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts/
282
294
                DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts/
283
295
                PATTERN ".svn" EXCLUDE
284
296
                PATTERN "__pycache__" EXCLUDE
285
297
                PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
 
298
                PATTERN "${FREESTYLE_EXCLUDE_CONDITIONAL}" EXCLUDE
286
299
        )
287
300
        
288
301
        unset(ADDON_EXCLUDE_CONDITIONAL)
 
302
        unset(FREESTYLE_EXCLUDE_CONDITIONAL)
289
303
endif()
290
304
 
291
305
# localization
407
421
                        # on some platforms (like openSUSE) Python is linked
408
422
                        # to be used from lib64 folder.
409
423
                        # determine this from Python's libraries path
410
 
                        if(${PYTHON_LIBPATH} MATCHES "lib64$")
 
424
                        #
 
425
                        # ugh, its possible 'lib64' is just a symlink to 'lib' which causes incorrect use of 'lib64'
 
426
                        get_filename_component(_pypath_real ${PYTHON_LIBPATH} REALPATH)
 
427
                        if(${_pypath_real} MATCHES "lib64$")
411
428
                                set(_target_LIB "lib64")
412
429
                        else()
413
430
                                set(_target_LIB "lib")
414
431
                        endif()
 
432
                        unset(_pypath_real)
415
433
 
416
434
                        # Copy the systems python into the install directory
417
435
                        # Scons copy in tools/Blender.py
468
486
        )
469
487
 
470
488
        if(WITH_PYTHON)
471
 
                set_lib_path(PYLIB "python")
472
 
 
473
 
                STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 
489
                string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
474
490
 
475
491
                install(
476
 
                        FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
 
492
                        FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
477
493
                        DESTINATION ${TARGETDIR}
478
494
                        CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
479
495
                )
480
496
 
481
497
                install(
482
 
                        FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
 
498
                        FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
483
499
                        DESTINATION ${TARGETDIR}
484
500
                        CONFIGURATIONS Debug
485
501
                )
518
534
                unset(_PYTHON_VERSION_NO_DOTS)
519
535
        endif()
520
536
 
521
 
        if(CMAKE_CL_64)
522
 
                # png is statically linked on win64
523
 
                install(
524
 
                        FILES ${LIBDIR}/zlib/lib/zlib.dll
525
 
                        DESTINATION ${TARGETDIR}
526
 
                )
527
 
        else()
528
 
                #not needed since we link statically, maybe also unneeded for MinGW?
529
 
                if(NOT WITH_MINGW64)
530
 
                        install(
531
 
                                FILES
532
 
                                        ${LIBDIR}/zlib/lib/zlib.dll
533
 
                                DESTINATION ${TARGETDIR}
534
 
                        )
535
 
                endif()
536
 
        endif()
537
 
 
538
537
        if(MSVC)
539
538
                install(
540
539
                        FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll
567
566
        endif()
568
567
 
569
568
        if(WITH_CODEC_FFMPEG)
570
 
                install(
571
 
                        FILES
572
 
                                ${LIBDIR}/ffmpeg/lib/avcodec-53.dll
573
 
                                ${LIBDIR}/ffmpeg/lib/avformat-53.dll
574
 
                                ${LIBDIR}/ffmpeg/lib/avdevice-53.dll
575
 
                                ${LIBDIR}/ffmpeg/lib/avutil-51.dll
576
 
                                ${LIBDIR}/ffmpeg/lib/swscale-2.dll
577
 
                        DESTINATION ${TARGETDIR}
578
 
                )
 
569
                if(MSVC11)
 
570
                        install(
 
571
                                FILES
 
572
                                        ${LIBDIR}/ffmpeg/lib/avcodec-54.dll
 
573
                                        ${LIBDIR}/ffmpeg/lib/avformat-54.dll
 
574
                                        ${LIBDIR}/ffmpeg/lib/avdevice-54.dll
 
575
                                        ${LIBDIR}/ffmpeg/lib/avutil-52.dll
 
576
                                        ${LIBDIR}/ffmpeg/lib/avfilter-3.dll
 
577
                                        ${LIBDIR}/ffmpeg/lib/swresample-0.dll
 
578
                                        ${LIBDIR}/ffmpeg/lib/swscale-2.dll
 
579
                                DESTINATION ${TARGETDIR}
 
580
                        )
 
581
                else()
 
582
                        install(
 
583
                                FILES
 
584
                                        ${LIBDIR}/ffmpeg/lib/avcodec-53.dll
 
585
                                        ${LIBDIR}/ffmpeg/lib/avformat-53.dll
 
586
                                        ${LIBDIR}/ffmpeg/lib/avdevice-53.dll
 
587
                                        ${LIBDIR}/ffmpeg/lib/avutil-51.dll
 
588
                                        ${LIBDIR}/ffmpeg/lib/swscale-2.dll
 
589
                                DESTINATION ${TARGETDIR}
 
590
                        )
 
591
                endif()
579
592
                if(WITH_MINGW64)
580
593
                install(
581
594
                        FILES
594
607
        endif()
595
608
 
596
609
        if(WITH_OPENAL)
597
 
                install(
598
 
                        FILES
599
 
                                ${LIBDIR}/openal/lib/OpenAL32.dll
600
 
                                ${LIBDIR}/openal/lib/wrap_oal.dll
601
 
                        DESTINATION ${TARGETDIR}
602
 
                )
 
610
                if(MSVC11)
 
611
                        install(
 
612
                                FILES
 
613
                                        ${LIBDIR}/openal/lib/OpenAL32.dll
 
614
                                DESTINATION ${TARGETDIR}
 
615
                        )
 
616
                else()
 
617
                        install(
 
618
                                FILES
 
619
                                        ${LIBDIR}/openal/lib/OpenAL32.dll
 
620
                                        ${LIBDIR}/openal/lib/wrap_oal.dll
 
621
                                DESTINATION ${TARGETDIR}
 
622
                        )
 
623
                endif()
603
624
        endif()
604
625
 
 
626
#       if(WITH_JACK AND MSVC11)
 
627
#               if(CMAKE_CL_64)
 
628
#                       install(
 
629
#                               FILES
 
630
#                                       ${LIBDIR}/jack/lib/libjack64.dll
 
631
#                               DESTINATION ${TARGETDIR}
 
632
#                       )
 
633
#               else()
 
634
#                       install(
 
635
#                               FILES
 
636
#                                       ${LIBDIR}/jack/lib/libjack.dll
 
637
#                               DESTINATION ${TARGETDIR}
 
638
#                       )
 
639
#               endif()
 
640
#       endif()
 
641
 
605
642
        if(WITH_SDL)
606
643
                if(NOT CMAKE_CL_64)
607
644
                        install(
687
724
        )
688
725
 
689
726
        # python
690
 
        if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE)
 
727
        if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
691
728
                # the python zip is first extract as part of the build process,
692
729
                # and then later installed as part of make install. this is much
693
730
                # quicker, and means we can easily exclude files on copy
740
777
                )
741
778
 
742
779
                # python
743
 
                if(WITH_PYTHON)
 
780
                if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK)
744
781
                        add_custom_command(
745
782
                                OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
746
783
                                COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
828
865
                bf_editor_util
829
866
                bf_editor_uvedit
830
867
                bf_editor_curve
831
 
                bf_editor_armature
832
868
                bf_editor_gpencil
833
869
                bf_editor_interface
834
870
                bf_editor_mesh
835
871
                bf_editor_metaball
836
872
                bf_editor_object
 
873
                bf_editor_armature
837
874
                bf_editor_physics
838
875
                bf_editor_render
839
876
                bf_editor_screen
850
887
                bf_python_ext
851
888
                bf_python_mathutils
852
889
                bf_python_bmesh
 
890
                bf_freestyle
853
891
                bf_ikplugin
854
892
                bf_modifiers
855
893
                bf_bmesh
882
920
                extern_colamd
883
921
                ge_logic_ketsji
884
922
                extern_recastnavigation
885
 
                ge_phys_common
886
923
                ge_logic
887
924
                ge_rasterizer
888
925
                ge_oglrasterizer
911
948
                bf_intern_raskter
912
949
                bf_intern_opencolorio
913
950
                extern_rangetree
 
951
                extern_wcwidth
 
952
                extern_libmv
914
953
        )
915
954
 
916
955
        if(WITH_COMPOSITOR)
920
959
        endif()
921
960
 
922
961
        if(WITH_LIBMV)
923
 
                list(APPEND BLENDER_SORTED_LIBS extern_libmv)
924
 
                list(APPEND BLENDER_SORTED_LIBS extern_ssba)
925
962
                list(APPEND BLENDER_SORTED_LIBS extern_ceres)
926
963
        endif()
927
964
 
973
1010
                list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_intern_rigidbody")
974
1011
        endif()
975
1012
 
976
 
        if(WITH_BULLET AND NOT WITH_BULLET_SYSTEM)
 
1013
        if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET)
977
1014
                list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet")
978
1015
        endif()
979
1016