[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso CMakeLists.txt src/3rdparty/CMakeLists...
|
From: |
Remon Sijrier |
|
Subject: |
[Traverso-commit] traverso CMakeLists.txt src/3rdparty/CMakeLists... |
|
Date: |
Tue, 06 Nov 2007 18:25:16 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Remon Sijrier <r_sijrier> 07/11/06 18:25:16
Modified files:
. : CMakeLists.txt
src/3rdparty : CMakeLists.txt
src/commands/plugins/TraversoCommands: CMakeLists.txt
src/engine : CMakeLists.txt
src/plugins : CMakeLists.txt
src/traverso : CMakeLists.txt
src/traverso/widgets: InfoWidgets.cpp
Log message:
* Number of improvements to the cmake scripts:
* check for some system headers we use
* check if wanted/required headers and libraries are available
* show on console the options used for the build
* added option to use system installed slv2 headers/lib or the internal
ones.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/3rdparty/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/plugins/TraversoCommands/CMakeLists.txt?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/plugins/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/CMakeLists.txt?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.45&r2=1.46
Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CMakeLists.txt 5 Nov 2007 23:16:40 -0000 1.4
+++ CMakeLists.txt 6 Nov 2007 18:25:15 -0000 1.5
@@ -16,11 +16,16 @@
SET (VERSION_PATCH "0")
SET (VERSION_SUFFIX "")
SET (VERSION
${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
-MESSAGE(STATUS "Traverso ${VERSION} will be built to install into
${CMAKE_INSTALL_PREFIX}")
+MESSAGE(STATUS "Traverso ${VERSION} will be built to install into
${CMAKE_INSTALL_PREFIX}")
OPTION(WANT_JACK "Include Jack (Jack Audio Connection Kit) support" ON)
OPTION(WANT_ALSA "Include ALSA (Advanced Linux Sound Architecture)
support" ON)
+OPTION(WANT_PORTAUDIO "Include PortAudio support (Driver support for Mac OS X
and Windows" ON)
+OPTION(WANT_LV2 "Include LV2 Plugin support" ON)
+OPTION(USE_SYSTEM_SLV2_LIBRARY "Use system installed slv2 library. If not
found, the internal one is compiled and used which needs the rdf development
headers" OFF)
+OPTION(WANT_MP3_DECODE "Include mp3 decoding support, for playing mp3 files"
ON)
+OPTION(WANT_MP3_ENCODE "Include mp3 encoding support, for creating mp3 files"
ON)
OPTION(WANT_PCH "Use precompiled headers" ON)
OPTION(WANT_DEBUG "Debug build" ON)
OPTION(WANT_OPENGL "Build Traverso with OpenGL support" ON)
@@ -41,6 +46,7 @@
ENDIF (NOT CUSTOM_VERSIONTAG)
ENDIF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
+
#BUILD SETUP
#None, Debug, Release, .. or custom ones
IF(WANT_DEBUG)
@@ -50,15 +56,32 @@
SET(CMAKE_BUILD_TYPE RELEASE)
ENDIF(WANT_DEBUG)
+
IF(WANT_TRAVERSO_DEBUG)
ADD_DEFINITIONS(-DUSE_DEBUGGER)
ENDIF(WANT_TRAVERSO_DEBUG)
+
+# Static build is perfectly fine now, targets are properly relinked when
needed!
+ADD_DEFINITIONS(-DSTATIC_BUILD)
+
+
# Moves the Traverso exec. to the root dir and libs to the root's lib dir.
-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib)
+SET(MINIMAL_ALSA_VERSION 1.0.0)
+SET(MINIMAL_JACK_VERSION 0.100)
+SET(MINIMAL_PORTAUDIO_VERSION 19)
+SET(MINIMAL_SLV2_VERSION 0.2.0)
+SET(MINIMAL_WAVPACK_VERSION 4.40.0)
+SET(MINIMAL_OGG_VORBIS_VERSION 1.1.2)
+SET(MINIMAL_MAD_VERSION 0.15.0)
+SET(MINIMAL_FLAC_VERSION 1.1.2)
+SET(MINIMAL_FFTW_VERSION 3.0.0)
+
+
IF(APPLE)
SET( ENV{MACOSX_DEPLOYMENT_TARGET} 10.3 )
SET( ENV{LD_PREBIND} 1 )
@@ -92,6 +115,8 @@
include(${QT_USE_FILE})
+INCLUDE (ConfigureChecks.cmake)
+
IF(WANT_OPENGL)
IF(QT_QTOPENGL_FOUND)
ADD_DEFINITIONS(-DQT_OPENGL_SUPPORT)
@@ -101,7 +126,12 @@
IF(WANT_ALSA)
- PKG_CHECK_MODULES(ALSA alsa>=1.0.0)
+ CHECK_INCLUDE_FILE("alsa/asoundlib.h" HAVE_ASOUNDLIB_H)
+ IF(NOT HAVE_ASOUNDLIB_H)
+ MESSAGE(FATAL_ERROR "alsa support requested, but alsa
development headers could not be found!\nPlease install the alsa development
package (Usually called libasound-dev), remove CMakeCache.txt and run cmake
again")
+ ENDIF(NOT HAVE_ASOUNDLIB_H)
+
+ PKG_CHECK_MODULES(ALSA alsa>=${MINIMAL_ALSA_VERSION})
IF (ALSA_FOUND)
MESSAGE("-- ALSA Library Found OK")
ADD_DEFINITIONS(-DALSA_SUPPORT)
@@ -113,35 +143,140 @@
IF(WANT_JACK)
- PKG_CHECK_MODULES(JACK jack>=0.100)
+ CHECK_INCLUDE_FILE("jack/jack.h" HAVE_JACK_H)
+ IF(NOT HAVE_JACK_H)
+ MESSAGE(FATAL_ERROR "jack support requested, but jack
development headers could not be found!\nPlease install the jack development
package, remove CMakeCache.txt and run cmake again")
+ ENDIF(NOT HAVE_JACK_H)
+
+ PKG_CHECK_MODULES(JACK jack>=${MINIMAL_JACK_VERSION})
IF(JACK_FOUND)
ADD_DEFINITIONS(-DJACK_SUPPORT)
MESSAGE("-- Jack Library Found OK")
SET(HAVE_JACK TRUE)
SET(JACK_LIBS ${JACK_LIBRARIES})
- #MESSAGE("JACK_LIBS: ${JACK_LIBS}")
LIST(APPEND JACK_LIB_DIR ${JACK_LIBDIR} ${JACK_LIBRARY_DIRS})
- #MESSAGE("JACK_LIB_DIR: ${JACK_LIB_DIR}")
LIST(APPEND JACK_INC_DIR ${JACK_INCLUDEDIR}
${JACK_INCLUDE_DIRS})
- #MESSAGE("JACK_INC_DIR: ${JACK_INC_DIR}")
+ ELSE(JACK_FOUND)
+ MESSAGE(FATAL_ERROR "jack support requested, but jack libraries
could not be found!\nPlease install the jack runtime libraries, remove
CMakeCache.txt and run cmake again")
ENDIF(JACK_FOUND)
ELSE(WANT_JACK)
MESSAGE("-- Jack support: Disabled")
ENDIF(WANT_JACK)
-ADD_DEFINITIONS(-DLV2_SUPPORT)
-ADD_DEFINITIONS(-DSTATIC_BUILD)
-
-
-PKG_CHECK_MODULES(WAVPACK wavpack>=4.40.0)
+IF(WANT_PORTAUDIO)
+ CHECK_INCLUDE_FILE("portaudio.h" HAVE_PORTAUDIO_H)
+ IF(NOT HAVE_PORTAUDIO_H)
+ MESSAGE(FATAL_ERROR "PortAudio support requested, but PortAudio
development headers could not be found!\nPlease install the PortAudio
development package, remove CMakeCache.txt and run cmake again")
+ ENDIF(NOT HAVE_PORTAUDIO_H)
+ PKG_CHECK_MODULES(PORTAUDIO portaudio-2.0>=${MINIMAL_PORTAUDIO_VERSION})
+ IF(PORTAUDIO_FOUND)
+ ADD_DEFINITIONS(-DPORTAUDIO_SUPPORT)
+ MESSAGE("-- PortAudio Library Found OK")
+ SET(HAVE_PORTAUDIO TRUE)
+ ENDIF(PORTAUDIO_FOUND)
+ENDIF(WANT_PORTAUDIO)
+
+IF(WANT_LV2)
+ IF(USE_SYSTEM_SLV2_LIBRARY)
+ CHECK_INCLUDE_FILE("slv2/slv2.h" HAVE_SLV2_H)
+ IF(NOT HAVE_SLV2_H)
+ MESSAGE(FATAL_ERROR "lv2 support requested, but slv2
development headers could not be found!\nPlease install the slv2 development
package (Usually called libslv2-dev), remove CMakeCache.txt and run cmake
again")
+ ENDIF(NOT HAVE_SLV2_H)
+
+ PKG_CHECK_MODULES(SLV2 libslv2>=${MINIMAL_SLV2_VERSION})
+ IF (SLV2_FOUND)
+ MESSAGE("-- slv2 Library Found OK")
+ SET(HAVE_SYSTEM_SLV2 TRUE)
+ ENDIF(SLV2_FOUND)
+ ELSE(USE_SYSTEM_SLV2_LIBRARY)
+ CHECK_INCLUDE_FILE("librdf.h" HAVE_LIBRDF_H)
+ IF(NOT HAVE_LIBRDF_H)
+ MESSAGE(FATAL_ERROR "lv2 support requested using
internal slv2 lib, but the needed rdf development headers could not be
found!\nPlease install the rdf development package (Usually called librdf-dev),
remove CMakeCache.txt and run cmake again")
+ ENDIF(NOT HAVE_LIBRDF_H)
+
+ SET(USE_INTERNAL_SLV2_LIB TRUE)
+ ENDIF(USE_SYSTEM_SLV2_LIBRARY)
+
+ ADD_DEFINITIONS(-DLV2_SUPPORT)
+ SET(HAVE_SLV2 TRUE)
+ENDIF(WANT_LV2)
+
+
+CHECK_INCLUDE_FILE("wavpack/wavpack.h" HAVE_WAVPACK_H)
+IF(NOT HAVE_WAVPACK_H)
+ MESSAGE(FATAL_ERROR "WavPack development headers could not be
found!\nPlease install the WavPack development package, remove CMakeCache.txt
and run cmake again")
+ENDIF(NOT HAVE_WAVPACK_H)
+PKG_CHECK_MODULES(WAVPACK wavpack>=${MINIMAL_WAVPACK_VERSION})
IF (WAVPACK_FOUND)
MESSAGE("-- WavPack Library Found OK")
ELSE(WAVPACK_FOUND)
- MESSAGE(FATAL_ERROR "No WavPack found (WavPack >= 4.41.0 needs to be
installed!)")
+ MESSAGE(FATAL_ERROR "No WavPack found (WavPack >= ${MINIMAL_WAVPACK_VERSION}
needs to be installed!)")
ENDIF(WAVPACK_FOUND)
+CHECK_INCLUDE_FILE("vorbis/vorbisfile.h" HAVE_VORBISFILE_H)
+IF(NOT HAVE_VORBISFILE_H)
+ MESSAGE(FATAL_ERROR "Ogg Vorbis development headers could not be
found!\nPlease install the Ogg Vorbis development package, remove
CMakeCache.txt and run cmake again")
+ENDIF(NOT HAVE_VORBISFILE_H)
+PKG_CHECK_MODULES(VORBIS vorbis>=${MINIMAL_OGG_VORBIS_VERSION})
+IF (VORBIS_FOUND)
+ MESSAGE("-- Ogg Vorbis Library Found OK")
+ELSE(VORBIS_FOUND)
+ MESSAGE(FATAL_ERROR "No Ogg Vorbis found (Ogg Vorbis >=
${MINIMAL_OGG_VORBIS_VERSION} needs to be installed!)")
+ENDIF(VORBIS_FOUND)
+
+
+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)
+ 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)
+
+
+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)
+ PKG_CHECK_MODULES(MAD mad>=${MINIMAL_MAD_VERSION})
+ IF(MAD_FOUND)
+ ADD_DEFINITIONS(-DMP3_DECODE_SUPPORT)
+ MESSAGE("-- MP3 Decoding Library Found OK")
+ SET(HAVE_MP3_DECODING TRUE)
+ ENDIF(MAD_FOUND)
+ENDIF(WANT_MP3_DECODE)
+
+
+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)
+ ADD_DEFINITIONS(-DMP3_ENCODE_SUPPORT)
+ MESSAGE("-- Building with mp3 encoding support enabled")
+ SET(HAVE_MP3_ENCODING TRUE)
+ ENDIF(LAME_FOUND)
+ENDIF(WANT_MP3_ENCODE)
+
+
+CHECK_INCLUDE_FILE("fftw3.h" HAVE_FFTW3_H)
+IF(NOT HAVE_FFTW3_H)
+ MESSAGE(FATAL_ERROR "FFTW3 development headers could not be
found!\nPlease install the FFTW3 development package (fftw3-dev), remove
CMakeCache.txt and run cmake again")
+ENDIF(NOT HAVE_FFTW3_H)
+PKG_CHECK_MODULES(FFTW3 fftw3>=${MINIMAL_FFTW_VERSION})
+IF (FFTW3_FOUND)
+ MESSAGE("-- FFTW3 Library Found OK")
+ELSE(FFTW3_FOUND)
+ MESSAGE(FATAL_ERROR "No FFTW3 found (FFTW3 >= ${MINIMAL_FFTW_VERSION} needs
to be installed!)")
+ENDIF(FFTW3_FOUND)
+
+
# Check GCC for PCH support
SET(USE_PCH FALSE)
IF(WANT_PCH)
@@ -158,9 +293,7 @@
ENDIF(WANT_PCH)
-INCLUDE (ConfigureChecks.cmake)
-
-CHECK_INCLUDE_FILE("sys/sys/vfs.h" HAVE_SYS_VFS_H)
+CHECK_INCLUDE_FILE("sys/vfs.h" HAVE_SYS_VFS_H)
IF(HAVE_SYS_VFS_H)
ADD_DEFINITIONS(-DHAVE_SYS_VFS_H)
ENDIF(HAVE_SYS_VFS_H)
@@ -171,10 +304,9 @@
ENDIF(HAVE_SYS_STAT_H)
-#Create configure files.. config.h and uninstall
-#config.h
+#Create configure files.. config.h
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
-ADD_DEFINITIONS("-DHAVE_CONFIG_H")
+
#uninstall
CONFIGURE_FILE(
@@ -184,6 +316,7 @@
ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+
#Set up include dirs with all found packages
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/common
@@ -191,21 +324,21 @@
${QT_QTCORE_INCLUDE_DIR}
)
+
#Set up libraries to link with all found packages
LINK_LIBRARIES (
${QT_QT_LIBRARY}
)
+
IF(WIN32)
LINK_LIBRARIES(
${QT_QTMAIN_LIBRARY}
)
-ENDIF(WIN32)
-
-IF(WIN32)
ADD_DEFINITIONS(-DQT_DLL)
ENDIF(WIN32)
+
IF(APPLE)
LINK_LIBRARIES( "-undefined dynamic_lookup" )
LINK_LIBRARIES( "-framework CoreFoundation" )
@@ -216,14 +349,15 @@
ADD_SUBDIRECTORY(src)
+# TODO
#Install our READMEs etc.
-INSTALL(FILES
-AUTHORS
-README
-TODO
+# INSTALL(FILES
+# AUTHORS
+# README
+#
+# DESTINATION ${CMAKE_SOURCE_DIR}/src/
+# )
- DESTINATION ${CMAKE_SOURCE_DIR}/src/
-)
# If the cmake version includes cpack, use it
IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
@@ -244,8 +378,7 @@
"~$"
"Makefile$"
"\\\\.cvsignore$"
- "\\\\.tar$"
- "^${PROJECT_SOURCE_DIR}/traverso"
+ "^${PROJECT_SOURCE_DIR}.*/*tar.*"
"^${PROJECT_SOURCE_DIR}/cmake_uninstall.cmake"
"^${PROJECT_SOURCE_DIR}.*/precompile.h.gch"
"^${PROJECT_SOURCE_DIR}.*/cmake_install.cmake"
@@ -265,3 +398,23 @@
INCLUDE(CPack)
ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+
+IF(USE_INTERNAL_SLV2_LIB)
+ SET(SLV2OPTIONS "${HAVE_SLV2} (Using internal library)")
+ENDIF(USE_INTERNAL_SLV2_LIB)
+IF(USE_SYSTEM_SLV2_LIBRARY)
+ SET(SLV2OPTIONS "${HAVE_SLV2} (Using system library)")
+ENDIF(USE_SYSTEM_SLV2_LIBRARY)
+
+
+MESSAGE("")
+MESSAGE("Build options:")
+MESSAGE("Building in mode : ${CMAKE_BUILD_TYPE}")
+MESSAGE("ALSA support : ${HAVE_ALSA}")
+MESSAGE("Jack support : ${HAVE_JACK}")
+MESSAGE("PortAudio support : ${HAVE_PORTAUDIO}")
+MESSAGE("SLV2 support : ${SLV2OPTIONS}")
+MESSAGE("MP3 read support : ${HAVE_MP3_DECODING}")
+MESSAGE("MP3 writing support : ${HAVE_MP3_ENCODING}")
+MESSAGE("OpenGL support : ${HAVE_OPENGL}")
+MESSAGE("")
Index: src/3rdparty/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/3rdparty/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/3rdparty/CMakeLists.txt 5 Nov 2007 15:47:03 -0000 1.1
+++ src/3rdparty/CMakeLists.txt 6 Nov 2007 18:25:15 -0000 1.2
@@ -1,2 +1,4 @@
#Subdirectories
+IF(USE_INTERNAL_SLV2_LIB)
ADD_SUBDIRECTORY(slv2)
+ENDIF(USE_INTERNAL_SLV2_LIB)
Index: src/commands/plugins/TraversoCommands/CMakeLists.txt
===================================================================
RCS file:
/sources/traverso/traverso/src/commands/plugins/TraversoCommands/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/commands/plugins/TraversoCommands/CMakeLists.txt 5 Nov 2007
15:52:11 -0000 1.1
+++ src/commands/plugins/TraversoCommands/CMakeLists.txt 6 Nov 2007
18:25:16 -0000 1.2
@@ -26,3 +26,6 @@
ADD_LIBRARY(${TRAVERSO_COMMAND_PLUGIN_LIBRARY} STATIC
${TRAVERSO_COMMAND_PLUGIN_SOURCES} ${TRAVERSO_TRAVERSSO_COMMANDS_MOC_SOURCES})
+IF(USE_PCH)
+ ADD_DEPENDENCIES(tcp_traversocommands precompiled_headers)
+ENDIF(USE_PCH)
Index: src/engine/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/engine/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/engine/CMakeLists.txt 5 Nov 2007 22:28:11 -0000 1.2
+++ src/engine/CMakeLists.txt 6 Nov 2007 18:25:16 -0000 1.3
@@ -16,7 +16,6 @@
Client.cpp
Driver.cpp
memops.cpp
-PADriver.cpp
)
IF(HAVE_ALSA)
@@ -37,6 +36,13 @@
)
ENDIF(HAVE_JACK)
+IF(HAVE_PORTAUDIO)
+ SET(TRAVERSO_ENGINE_SOURCES
+ PADriver.cpp
+ ${TRAVERSO_ENGINE_SOURCES}
+ )
+ENDIF(HAVE_PORTAUDIO)
+
SET(TRAVERSO_ENGINE_LIBRARY "traversoaudiobackend")
Index: src/plugins/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/plugins/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/plugins/CMakeLists.txt 5 Nov 2007 22:28:11 -0000 1.2
+++ src/plugins/CMakeLists.txt 6 Nov 2007 18:25:16 -0000 1.3
@@ -3,12 +3,17 @@
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/engine
${CMAKE_SOURCE_DIR}/src/commands
-${CMAKE_SOURCE_DIR}/src/plugins/LV2
${CMAKE_SOURCE_DIR}/src/plugins/native
-${CMAKE_SOURCE_DIR}/src/3rdparty/slv2
+${CMAKE_SOURCE_DIR}/src/plugins/LV2
${QT_QTXML_INCLUDE_DIR}
)
+IF(USE_INTERNAL_SLV2_LIB)
+ INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}/src/3rdparty/slv2
+ )
+ENDIF(USE_INTERNAL_SLV2_LIB)
+
SET(TRAVERSO_PLUGINS_SOURCES
PluginChain.cpp
Plugin.cpp
@@ -16,7 +21,6 @@
PluginSlider.cpp
native/CorrelationMeter.cpp
native/SpectralMeter.cpp
-LV2/LV2Plugin.cpp
native/GainEnvelope.cpp
PluginPropertiesDialog.cpp
)
@@ -29,9 +33,19 @@
native/CorrelationMeter.h
native/GainEnvelope.h
native/SpectralMeter.h
-LV2/LV2Plugin.h
)
+IF(HAVE_SLV2)
+ SET(TRAVERSO_PLUGINS_SOURCES
+ ${TRAVERSO_PLUGINS_SOURCES}
+ LV2/LV2Plugin.cpp
+ )
+ SET(TRAVERSO_PLUGINS_MOC_CLASSES
+ ${TRAVERSO_PLUGINS_MOC_CLASSES}
+ LV2/LV2Plugin.h
+ )
+ENDIF(HAVE_SLV2)
+
QT4_WRAP_CPP(TRAVERSO_PLUGINS_MOC_SOURCES ${TRAVERSO_PLUGINS_MOC_CLASSES})
SET(TRAVERSO_PLUGINS_LIBRARY "traversoplugins")
Index: src/traverso/CMakeLists.txt
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/CMakeLists.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/traverso/CMakeLists.txt 5 Nov 2007 22:28:11 -0000 1.2
+++ src/traverso/CMakeLists.txt 6 Nov 2007 18:25:16 -0000 1.3
@@ -7,13 +7,19 @@
${CMAKE_SOURCE_DIR}/src/engine
${CMAKE_SOURCE_DIR}/src/plugins
${CMAKE_SOURCE_DIR}/src/plugins/LV2
-${CMAKE_SOURCE_DIR}/src/3rdparty/slv2
${CMAKE_SOURCE_DIR}/src/plugins/native
${CMAKE_SOURCE_DIR}/src/traverso/songcanvas
${QT_QTGUI_INCLUDE_DIR}
${QT_QTXML_INCLUDE_DIR}
)
+IF(USE_INTERNAL_SLV2_LIB)
+ INCLUDE_DIRECTORIES(
+ ${CMAKE_SOURCE_DIR}/src/3rdparty/slv2
+ )
+ENDIF(USE_INTERNAL_SLV2_LIB)
+
+
SET(TRAVERSO_GUI_SOURCES
Traverso.cpp
BusMonitor.cpp
@@ -135,20 +141,48 @@
vorbis
vorbisfile
vorbisenc
- mad
- mp3lame
FLAC
- traversoslv2
+ fftw3
+)
+
+IF(HAVE_PORTAUDIO)
+ TARGET_LINK_LIBRARIES(traverso
+ portaudio
+ )
+ENDIF(HAVE_PORTAUDIO)
+
+IF(HAVE_SLV2)
+ IF(USE_SYSTEM_SLV2_LIBRARY)
+ TARGET_LINK_LIBRARIES(traverso
+ slv2
+ )
+ ELSE(USE_SYSTEM_SLV2_LIBRARY)
+ TARGET_LINK_LIBRARIES(traverso
rdf
rasqal
raptor
- fftw3
-)
+ traversoslv2
+ )
+ ENDIF(USE_SYSTEM_SLV2_LIBRARY)
+ENDIF(HAVE_SLV2)
+
+IF(HAVE_MP3_DECODING)
+ TARGET_LINK_LIBRARIES(traverso
+ mad
+ )
+ENDIF(HAVE_MP3_DECODING)
+
+IF(HAVE_MP3_ENCODING)
+ TARGET_LINK_LIBRARIES(traverso
+ mp3lame
+ )
+ENDIF(HAVE_MP3_ENCODING)
+
IF(HAVE_OPENGL)
-TARGET_LINK_LIBRARIES(traverso
-${QT_QTOPENGL_LIBRARY}
-)
+ TARGET_LINK_LIBRARIES(traverso
+ ${QT_QTOPENGL_LIBRARY}
+ )
ENDIF(HAVE_OPENGL)
IF(HAVE_ALSA)
Index: src/traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- src/traverso/widgets/InfoWidgets.cpp 29 Oct 2007 08:42:14 -0000
1.45
+++ src/traverso/widgets/InfoWidgets.cpp 6 Nov 2007 18:25:16 -0000
1.46
@@ -41,8 +41,10 @@
#include <sys/param.h>
#include <sys/mount.h>
#else
+#if defined(HAVE_SYS_VFS_H)
#include <sys/vfs.h>
#endif
+#endif
// Always put me below _all_ includes, this is needed
@@ -285,6 +287,8 @@
return;
}
+ double space = 0.0;
+
#if defined (Q_WS_WIN)
__int64 freebytestocaller, totalbytes, freebytes;
if (! GetDiskFreeSpaceEx ((const
WCHAR*)(m_project->get_root_dir().toUtf8().data()),
@@ -297,11 +301,18 @@
return;
}
- double space = double(freebytestocaller / (1 << 20));
+ space = double(freebytestocaller / (1 << 20));
+#else
+
+#if !defined(HAVE_SYS_VFS_H)
+ m_button->setText("No Info");
+ return;
#else
+
struct statfs fs;
statfs(m_project->get_root_dir().toUtf8().data(), &fs);
- double space = floor (fs.f_bavail * (fs.f_bsize / 1048576.0));
+ space = floor (fs.f_bavail * (fs.f_bsize / 1048576.0));
+#endif
#endif
QList<Song*> recordingSongs;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso CMakeLists.txt src/3rdparty/CMakeLists...,
Remon Sijrier <=