zynaddsubfx

ZynAddSubFX open source synthesizer
Log | Files | Refs | Submodules | LICENSE

commit 534f44a8c4e63a3382f8244fcc250fa116f28552
parent 1888716f4aef9082ea7657bb4b18c87579961793
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Sat, 27 Aug 2011 12:54:33 -0400

Cmake: Adding find scripts for pthreads and OSS

Diffstat:
Acmake/FindOSS.cmake | 9+++++++++
Msrc/CMakeLists.txt | 15++++-----------
2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/cmake/FindOSS.cmake b/cmake/FindOSS.cmake @@ -0,0 +1,9 @@ +# Find OSS (Open Sound System) +find_path(OSS_INCLUDE_DIR sys/soundcard.h) +set(OSS_LIBRARIES True) +mark_as_advanced(OSS_INCLUDE_DIR) + +# handle the QUIETLY and REQUIRED arguments and set zlib_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(OSS DEFAULT_MSG OSS_LIBRARIES OSS_INCLUDE_DIR) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt @@ -7,8 +7,8 @@ find_package(zlib REQUIRED) find_package(fftw REQUIRED) find_package(MXML REQUIRED) find_package(PkgConfig REQUIRED) -#find_package(pthread REQUIRED) -#find_package(OSS) +find_package(Threads REQUIRED) +find_package(OSS) find_package(Alsa) find_package(JACK) find_package(PortAudio) @@ -44,7 +44,7 @@ SET (AlsaEnable ${ALSA_FOUND} CACHE BOOL "Enable support for Advanced Linux Sound Architecture") SET (JackEnable ${JACK_FOUND} CACHE BOOL "Enable support for JACK Audio Connection toolKit") -SET (OssEnable ${ALSA_FOUND} CACHE BOOL #TODO perhaps check for /dev/dsp +SET (OssEnable ${OSS_FOUND} CACHE BOOL "Enable support for Open Sound System") SET (PaEnable ${PORTAUDIO_FOUND} CACHE BOOL "Enable support for Port Audio System") @@ -142,14 +142,6 @@ add_definitions( -Wextra ) -#set os flag -if(UNIX) - add_definitions(-DOS_LINUX=1) - set(OS_LIBRARIES "-lpthread") -else() - message(STATUS "Error: building on unsupported OS") -endif() - if (BuildForDebug) set (CMAKE_BUILD_TYPE "Debug") set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug}) @@ -262,6 +254,7 @@ target_link_libraries(zynaddsubfx ${NIO_LIBRARIES} ${AUDIO_LIBRARIES} ${OS_LIBRARIES} + pthread ) if (DssiEnable)