← Back to branch summary

~ubuntu-branches/ubuntu/karmic/avidemux/karmic-proposed

« back to all changes in this revision

Viewing changes to ConfigureChecks.cmake

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-02-17 23:41:46 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20090217234146-eakx254awuch4wgw
Tags: 1:2.4.4-0.0ubuntu1
* Merge from debian multimedia, Ubuntu remaining changes:
  - debian/control:
    + Build-Depends on newer libx264-dev.
    + Don't Build-Depends on ccache and libamrnb-dev.
    + Build-Depends on libpulse-dev.
    + Fixed small typo in avidemux description.
  - Don't use ccache.
  - Drop patch to fix build with newer x264, it has been merged by upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ConfigureChecks.cmake
32
32
                SET(ADM_CPU_X86_64 1)
33
33
        ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc")
34
34
                SET(ADM_CPU_PPC 1)
 
35
        ELSEIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64")
 
36
                SET(ADM_CPU_PPC 1)
 
37
                SET(ARCH_64_BITS 1)     
35
38
        ENDIF (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i586" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686")
36
39
ENDIF (WIN32)
37
40
 
127
130
########################################
128
131
# Standard Avidemux defines
129
132
########################################
130
 
SET(VERSION 2.4.3)
131
 
SET(PACKAGE_VERSION 2.4.3)
 
133
SET(VERSION 2.4.4)
 
134
SET(PACKAGE_VERSION 2.4.4)
132
135
 
133
136
SET(HAVE_BUILTIN_VECTOR 1)
134
137
SET(HAVE_AUDIO 1)
222
225
########################################
223
226
# Locale
224
227
########################################
225
 
SET(ADM_LOCALE "${CMAKE_INSTALL_PREFIX}/share/locale")
 
228
IF (NOT ADM_LOCALE) 
 
229
   SET(ADM_LOCALE "${CMAKE_INSTALL_PREFIX}/share/locale")
 
230
ENDIF (NOT ADM_LOCALE)
226
231
 
227
232
########################################
228
233
# ALSA
475
480
IF (USE_LATE_BINDING)
476
481
        CHECK_INCLUDE_FILES(dts.h USE_LIBDCA)
477
482
ELSE (USE_LATE_BINDING)
478
 
        ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA)
 
483
        ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA_A)
 
484
        if(NOT USE_LIBDCA_A)
 
485
                MESSAGE(STATUS "Trying libdca instead of libdts")
 
486
                ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA_B)
 
487
                if(USE_LIBDCA_B)
 
488
                        SET(USE_DCA_INSTEAD_OF_DTS 1)
 
489
                        SET(USE_LIBDCA 1)
 
490
                endif(USE_LIBDCA_B)
 
491
                
 
492
        else(NOT USE_LIBDCA_A)
 
493
                SET(USE_LIBDCA 1)
 
494
        endif(NOT USE_LIBDCA_A)
479
495
ENDIF (USE_LATE_BINDING)
480
496
 
481
497
SET(CMAKE_REQUIRED_LIBRARIES)
497
513
SET(CMAKE_REQUIRED_LIBRARIES)
498
514
 
499
515
########################################
500
 
# PNG
501
 
########################################
502
 
ADM_CHECK_HL(libPNG png.h png png_malloc USE_PNG)
503
 
 
504
 
########################################
505
516
# FAAD
506
517
########################################
507
518
ADM_CHECK_HL(FAAD faad.h faad faacDecInit USE_FAAD_P)