zynaddsubfx

commit 506221452a79c445a5a20bd28bb45bf4a1c0cdb1
parent d2a634e8bdd937ca033c84cbf9b841d69d4c7e0e
Author: fundamental <[email protected]>
Date:   Thu,  4 Mar 2010 09:21:52 -0500

Merge branch 'master' of ssh://zynaddsubfx.git.sourceforge.net/gitroot/zynaddsubfx/zynaddsubfx

Diffstat:
M
src/CMakeLists.txt
 | 
17
+++++++++++++++++
M
src/Misc/CMakeLists.txt
 | 
4
++++

2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,6 +2,7 @@
 find_package(zlib REQUIRED)
 find_package(fftw REQUIRED)
 find_package(MXML REQUIRED)
+find_package(PkgConfig REQUIRED)
 #find_package(pthread REQUIRED)
 find_package(Alsa)
 find_package(JACK)
@@ -17,6 +18,7 @@ SET (OutputModule alsa CACHE STRING "Output module, either alsa, jack or portaud
 SET (GuiModule fltk CACHE STRING "GUI module, either fltk, qt or off")
 SET (CompileTests OFF CACHE BOOL "whether tests should be compiled in or not")
 
+
 # Now, handle the incoming settings and set define flags/variables based
 # on this
 
@@ -42,6 +44,14 @@ else ()
 	message(FATAL_ERROR "OutputModule must be either alsa, jack or portaudio")
 endif()
 
+if(NOT PKG_CONFIG_FOUND)
+    message(FATAL_ERROR "pkg-config not found")
+endif(NOT PKG_CONFIG_FOUND)
+
+# lash
+pkg_search_module(LASH lash-1.0)
+mark_as_advanced(LASH_LIBRARIES)
+
 ########### Settings dependant code ###########
 # From here on, the setting variables have  been prepared so concentrate
 # on the actual compiling.
@@ -67,6 +77,13 @@ if(PortAudioOutput)
         set(AUDIO_LIBRARIES ${AUDIO_LIBRARIES} ${PORTAUDIO_LIBRARIES})
 endif()
 
+if(LASH_FOUND)
+	include_directories(${LASH_INCLUDE_DIRS})
+	add_definitions(-DUSE_LASH)
+	set(AUDIO_LIBRARIES ${AUDIO_LIBRARIES} ${LASH_LIBRARIES})
+	message(STATUS "Compiling with lash")
+endif()
+
 add_definitions(-DFFTW_VERSION_${FFTW_VERSION}
 	 -DOS_LINUX
 	 -DALSAMIDIIN
diff --git a/src/Misc/CMakeLists.txt b/src/Misc/CMakeLists.txt
@@ -11,6 +11,10 @@ set(zynaddsubfx_misc_SRCS
 	XMLwrapper.cpp
 )
 
+if (LASH_FOUND)
+    set(zynaddsubfx_misc_SRCS ${zynaddsubfx_misc_SRCS} LASHClient.cpp)
+endif()
+
 add_library(zynaddsubfx_misc STATIC
 	${zynaddsubfx_misc_SRCS} 
 	)