diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-10 17:50:28 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-10 17:50:28 +0400 |
| commit | cb2f91b9d2660ddf1c8b730c7b1ee2b2e1170a0b (patch) | |
| tree | fe27ae1867309645831e5881f43293ab3104f457 /CMakeLists.txt | |
| parent | 4121e4b7e7420bfafe218da501162c8eae22a158 (diff) | |
OSX/cmake: rework the optional frameworks handling more osx-like, make jack weak-linked
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 822c77ba094..cb656614b00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1383,10 +1383,13 @@ elseif(APPLE) endif() if(WITH_JACK) - set(JACK /usr/local) - set(JACK_INCLUDE_DIRS ${JACK}/include/jack) - set(JACK_LIBRARIES jack) - set(JACK_LIBPATH ${JACK}/lib) + find_library(JACK_FRAMEWORK + NAMES jackmp + ) + set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers) + if(NOT JACK_FRAMEWORK) + set(WITH_JACK OFF) + endif() endif() if(WITH_CODEC_SNDFILE) @@ -1497,10 +1500,10 @@ elseif(APPLE) if(WITH_INPUT_NDOF) # This thread it *should* work and check the framework - campbell # http://www.cmake.org/pipermail/cmake/2005-December/007740.html - find_library(3D_CONNEXION_CLIENT_LIBRARY + find_library(3DCONNEXION_CLIENT_FRAMEWORK NAMES 3DconnexionClient ) - if(NOT 3D_CONNEXION_CLIENT_LIBRARY) + if(NOT 3DCONNEXION_CLIENT_FRAMEWORK) set(WITH_INPUT_NDOF OFF) endif() @@ -1508,7 +1511,11 @@ elseif(APPLE) set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework 3DconnexionClient") endif() endif() - + + if(WITH_JACK) + set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework jackmp") + endif() + else() set(PLATFORM_CFLAGS "-pipe -funsigned-char") set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime") |