[Traverso-commit] traverso CMakeLists.txt

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/02/14 08:35:06

Modified files:
        .              : CMakeLists.txt 

Log message:
        * improved detection of flac/mad (I hope)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.25&r2=1.26

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/CMakeLists.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- CMakeLists.txt      12 Feb 2008 18:06:37 -0000      1.25
+++ CMakeLists.txt      14 Feb 2008 08:35:06 -0000      1.26
@@ -231,28 +231,33 @@
 
 
 CHECK_INCLUDE_FILE("FLAC/export.h" HAVE_FLAC_H)
-IF(NOT HAVE_FLAC_H)
-       MESSAGE(FATAL_ERROR "FLAC development headers could not be 
found!\nPlease install the FLAC development package, remove CMakeCache.txt and 
run cmake again")
-ENDIF(NOT HAVE_FLAC_H)
-PKG_CHECK_MODULES(FLAC  flac>=${MINIMAL_FLAC_VERSION})
-IF (FLAC_FOUND)
+IF(HAVE_FLAC_H)
   MESSAGE("-- FLAC Library Found OK")
-ELSE(FLAC_FOUND)
-  MESSAGE(SEND_ERROR "No FLAC found (FLAC >= ${MINIMAL_FLAC_VERSION} needs to 
be installed!)")
-ENDIF(FLAC_FOUND)
+ELSE(HAVE_FLAC_H)
+       PKG_CHECK_MODULES(FLAC  flac>=${MINIMAL_FLAC_VERSION})
+       IF (FLAC_FOUND)
+               MESSAGE("-- FLAC Library Found OK")
+       ELSE(FLAC_FOUND)
+               MESSAGE(FATAL_ERROR "No FLAC found (FLAC >= 
${MINIMAL_FLAC_VERSION} needs to be installed!)")
+       ENDIF(FLAC_FOUND)
+ENDIF(HAVE_FLAC_H)
 
 
 IF(WANT_MP3_DECODE)
        CHECK_INCLUDE_FILE("mad.h" HAVE_MAD_H)
-       IF(NOT HAVE_MAD_H)
-               MESSAGE(FATAL_ERROR "MP3 decoding support requested, but mp3 
development headers (mad.h) could not be found!\nPlease install the mp3 
development package (Usually called libmad0-dev), remove CMakeCache.txt and run 
cmake again")
-       ENDIF(NOT HAVE_MAD_H)
+       IF(HAVE_MAD_H)
+               SET(HAVE_MP3_DECODING TRUE)
+               LIST(APPEND TRAVERSO_DEFINES -DMP3_DECODE_SUPPORT)
+       ELSE(HAVE_MAD_H)
        PKG_CHECK_MODULES(MAD mad>=${MINIMAL_MAD_VERSION})
        IF(MAD_FOUND)
+                       SET(HAVE_MP3_DECODING TRUE)
                LIST(APPEND TRAVERSO_DEFINES -DMP3_DECODE_SUPPORT)
                MESSAGE("-- MP3 Decoding Library Found OK")
-               SET(HAVE_MP3_DECODING TRUE)
+               ELSE(MAD_FOUND)
+                       MESSAGE(FATAL_ERROR "MP3 decoding support requested, 
but mp3 development headers (mad.h) could not be found!\nPlease install the mp3 
development package (Usually called libmad0-dev), remove CMakeCache.txt and run 
cmake again")
        ENDIF(MAD_FOUND)
+       ENDIF(HAVE_MAD_H)
 ELSE(WANT_MP3_DECODE)
        SET(HAVE_MP3_DECODING FALSE)
 ENDIF(WANT_MP3_DECODE)
@@ -260,13 +265,13 @@
 
 IF(WANT_MP3_ENCODE)
        CHECK_INCLUDE_FILE("lame/lame.h" HAVE_LAME_H)
-       IF(NOT HAVE_LAME_H)
-               MESSAGE(FATAL_ERROR "MP3 encoding support requested, but mp3 
development headers (lame.h) could not be found!\nPlease install the lame 
development package (Usually called liblame-dev), remove CMakeCache.txt and run 
cmake again")
-       ENDIF(NOT HAVE_LAME_H)
+       IF(HAVE_LAME_H)
                LIST(APPEND TRAVERSO_DEFINES -DMP3_ENCODE_SUPPORT)
                MESSAGE("-- Building with mp3 encoding support enabled")
                SET(HAVE_MP3_ENCODING TRUE)
-       ENDIF(LAME_FOUND)
+       ELSE(HAVE_LAME_H)
+               MESSAGE(FATAL_ERROR "MP3 encoding support requested, but mp3 
development headers (lame.h) could not be found!\nPlease install the lame 
development package (Usually called liblame-dev), remove CMakeCache.txt and run 
cmake again")
+       ENDIF(HAVE_LAME_H)
 ELSE(WANT_MP3_ENCODE)
        SET(HAVE_MP3_ENCODING FALSE)
 ENDIF(WANT_MP3_ENCODE)