[Traverso-commit] traverso CMakeLists.txt src/audiofileio/CMakeLi...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/11/07 12:57:53

Modified files:
        .              : CMakeLists.txt 
        src/audiofileio: CMakeLists.txt 

Log message:
        * Do not compile mp3 read/write when it's disabled
        * some minor improvements on the base cmake file

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/CMakeLists.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CMakeLists.txt      6 Nov 2007 18:25:15 -0000       1.5
+++ CMakeLists.txt      7 Nov 2007 12:57:52 -0000       1.6
@@ -122,6 +122,8 @@
                ADD_DEFINITIONS(-DQT_OPENGL_SUPPORT)
                SET(HAVE_OPENGL TRUE)
        ENDIF(QT_QTOPENGL_FOUND)
+ELSE(WANT_OPENGL)
+       SET(HAVE_OPENGL FALSE)
 ENDIF(WANT_OPENGL)
 
 
@@ -139,6 +141,7 @@
        ENDIF(ALSA_FOUND)
 ELSE(WANT_ALSA)
        MESSAGE("-- ALSA support: Disabled")
+       SET(HAVE_ALSA FALSE)
 ENDIF(WANT_ALSA)
 
 
@@ -161,6 +164,7 @@
        ENDIF(JACK_FOUND)
 ELSE(WANT_JACK)
        MESSAGE("-- Jack support: Disabled")
+       SET(HAVE_JACK FALSE)
 ENDIF(WANT_JACK)
 
 
@@ -175,6 +179,8 @@
                MESSAGE("-- PortAudio Library Found OK")
                SET(HAVE_PORTAUDIO TRUE)
        ENDIF(PORTAUDIO_FOUND)
+ELSE(WANT_PORTAUDIO)
+               SET(HAVE_PORTAUDIO FALSE)
 ENDIF(WANT_PORTAUDIO)
 
 IF(WANT_LV2)
@@ -200,6 +206,8 @@
        
        ADD_DEFINITIONS(-DLV2_SUPPORT)
        SET(HAVE_SLV2 TRUE)
+ELSE(WANT_LV2)
+       SET(HAVE_SLV2 FALSE)
 ENDIF(WANT_LV2)
 
 
@@ -250,6 +258,8 @@
                MESSAGE("-- MP3 Decoding Library Found OK")
                SET(HAVE_MP3_DECODING TRUE)
        ENDIF(MAD_FOUND)
+ELSE(WANT_MP3_DECODE)
+       SET(HAVE_MP3_DECODING FALSE)
 ENDIF(WANT_MP3_DECODE)
 
 
@@ -262,6 +272,8 @@
                MESSAGE("-- Building with mp3 encoding support enabled")
                SET(HAVE_MP3_ENCODING TRUE)
        ENDIF(LAME_FOUND)
+ELSE(WANT_MP3_ENCODE)
+       SET(HAVE_MP3_ENCODING FALSE)
 ENDIF(WANT_MP3_ENCODE)
 
 
@@ -405,6 +417,18 @@
 IF(USE_SYSTEM_SLV2_LIBRARY)
        SET(SLV2OPTIONS "${HAVE_SLV2} (Using system library)")
 ENDIF(USE_SYSTEM_SLV2_LIBRARY)
+IF(NOT HAVE_SLV2)
+       SET(SLV2OPTIONS "${HAVE_SLV2}")
+ENDIF(NOT HAVE_SLV2)
+
+
+# Mark the following optoins as advanced
+MARK_AS_ADVANCED(
+QT_X11_X11_LIBRARY
+QT_X11_m_LIBRARY
+QT_X11_Xext_LIBRARY
+LIBRARY_OUTPUT_PATH
+)
 
 
 MESSAGE("")

Index: src/audiofileio/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/audiofileio/CMakeLists.txt      5 Nov 2007 22:28:10 -0000       1.2
+++ src/audiofileio/CMakeLists.txt      7 Nov 2007 12:57:53 -0000       1.3
@@ -10,15 +10,28 @@
 decode/ResampleAudioReader.cpp
 decode/VorbisAudioReader.cpp
 decode/WPAudioReader.cpp
-decode/MadAudioReader.cpp
 encode/AbstractAudioWriter.cpp
 encode/SFAudioWriter.cpp
 encode/WPAudioWriter.cpp
 encode/FlacAudioWriter.cpp
 encode/VorbisAudioWriter.cpp
-encode/LameAudioWriter.cpp
 )
 
+IF(HAVE_MP3_DECODING)
+       SET(TRAVERSO_AUDIOFILEIO_SOURCES
+               ${TRAVERSO_AUDIOFILEIO_SOURCES}
+               decode/MadAudioReader.cpp
+       )
+ENDIF(HAVE_MP3_DECODING)
+
+IF(HAVE_MP3_ENCODING)
+       SET(TRAVERSO_AUDIOFILEIO_SOURCES
+               ${TRAVERSO_AUDIOFILEIO_SOURCES}
+               encode/LameAudioWriter.cpp
+       )
+ENDIF(HAVE_MP3_ENCODING)
+
+
 SET(TRAVERSO_AUDIOFILEIO_LIBRARY "traversoaudiofileio")
 
 ADD_LIBRARY(${TRAVERSO_AUDIOFILEIO_LIBRARY} STATIC 
${TRAVERSO_AUDIOFILEIO_SOURCES})