summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-04-15 17:43:50 -0400
committerTom Rondeau <trondeau@vt.edu>2012-04-15 17:43:50 -0400
commit81b2c2803bd9def8376e14cbe01998cb69139377 (patch)
treee05947fc154d8ebf1a56ff7d759522699d9198b7 /cmake
parent19a387d6e6cec8041d28556d3004650bf7db75ec (diff)
parent25d687550a0322ffaf270f25faf2b4a78a97142c (diff)
Merge branch 'maint'
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/FindJack.cmake15
1 files changed, 5 insertions, 10 deletions
diff --git a/cmake/Modules/FindJack.cmake b/cmake/Modules/FindJack.cmake
index c6810c011d..4bdfe0a7e7 100644
--- a/cmake/Modules/FindJack.cmake
+++ b/cmake/Modules/FindJack.cmake
@@ -51,24 +51,19 @@ else (JACK_LIBRARIES AND JACK_INCLUDE_DIRS)
/sw/lib
)
- if (JACK_LIBRARY)
+ if (JACK_LIBRARY AND JACK_INCLUDE_DIR)
set(JACK_FOUND TRUE)
- endif (JACK_LIBRARY)
- set(JACK_INCLUDE_DIRS
- ${JACK_INCLUDE_DIR}
- )
+ set(JACK_INCLUDE_DIRS
+ ${JACK_INCLUDE_DIR}
+ )
- if (JACK_FOUND)
set(JACK_LIBRARIES
${JACK_LIBRARIES}
${JACK_LIBRARY}
)
- endif (JACK_FOUND)
- if (JACK_INCLUDE_DIRS AND JACK_LIBRARIES)
- set(JACK_FOUND TRUE)
- endif (JACK_INCLUDE_DIRS AND JACK_LIBRARIES)
+ endif (JACK_LIBRARY AND JACK_INCLUDE_DIR)
if (JACK_FOUND)
if (NOT JACK_FIND_QUIETLY)