diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-11 22:28:45 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2012-11-11 22:28:45 +0400 |
| commit | 6f32bece7faa16b9fbc5c794822c545c0ab51640 (patch) | |
| tree | a5b9ef2a517d635d52db7b89639d0729b7cb7b63 /CMakeLists.txt | |
| parent | 724c55aafaee9078e6f49fd0e50c80d24105a699 (diff) | |
revert muddle in changing jack in msvc instead apple
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e162b0b1508..aa36995dfa6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1079,13 +1079,11 @@ elseif(WIN32) endif() if(WITH_JACK) - find_library(JACK_FRAMEWORK - NAMES jackmp + set(JACK_INCLUDE_DIRS + ${LIBDIR}/jack/include/jack + ${LIBDIR}/jack/include ) - set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers) - if(NOT JACK_FRAMEWORK) - set(WITH_JACK OFF) - endif() + set(JACK_LIBRARIES ${LIBDIR}/jack/lib/libjack.lib) endif() if(WITH_PYTHON) @@ -1358,10 +1356,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) |