From 93331432d79d5d93c9d02f404c357f7c9d37bdc9 Mon Sep 17 00:00:00 2001 From: Alberto Villa Date: Tue, 8 Nov 2011 09:27:00 +0100 Subject: [PATCH] Cleanup and make less noisy --- cmake/modules/FindLIBMLT.cmake | 36 ++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/cmake/modules/FindLIBMLT.cmake b/cmake/modules/FindLIBMLT.cmake index dcae97e0..247487dc 100644 --- a/cmake/modules/FindLIBMLT.cmake +++ b/cmake/modules/FindLIBMLT.cmake @@ -8,25 +8,41 @@ add_definitions(-DMLT_PREFIX=\\\"\"${MLT_PREFIX}\"\\\") find_path(LIBMLT_INCLUDE_DIR NAMES framework/mlt.h - PATHS ${MLT_INCLUDEDIR}/mlt ${MLT_PREFIX}/include/mlt /usr/local/include/mlt /usr/include/mlt + PATHS + ${MLT_INCLUDEDIR}/mlt + ${MLT_PREFIX}/include/mlt + /usr/local/include/mlt + /usr/include/mlt NO_DEFAULT_PATH ) find_library(LIBMLT_LIBRARY NAMES mlt - PATHS ${MLT_LIBDIR} ${MLT_PREFIX}/lib /usr/lib /usr/local/lib + PATHS + ${MLT_LIBDIR} + ${MLT_PREFIX}/lib + /usr/local/lib + /usr/lib NO_DEFAULT_PATH ) find_path(LIBMLTPLUS_INCLUDE_DIR NAMES mlt++/Mlt.h - PATHS ${MLT_INCLUDEDIR} ${MLT_PREFIX}/include /usr/local/include /usr/include + PATHS + ${MLT_INCLUDEDIR} + ${MLT_PREFIX}/include + /usr/local/include + /usr/include NO_DEFAULT_PATH ) find_library(LIBMLTPLUS_LIBRARY NAMES mlt++ - PATHS ${MLT_LIBDIR} ${MLT_PREFIX}/lib /usr/lib /usr/local/lib + PATHS + ${MLT_LIBDIR} + ${MLT_PREFIX}/lib + /usr/local/lib + /usr/lib NO_DEFAULT_PATH ) @@ -37,7 +53,7 @@ else(LIBMLT_LIBRARY AND LIBMLT_INCLUDE_DIR) set(LIBMLT_FOUND 0) endif(LIBMLT_LIBRARY AND LIBMLT_INCLUDE_DIR) -if(LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR) +if(LIBMLT_FOUND AND LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR) set(LIBMLT_FOUND 1) set(LIBMLTPLUS_LIBRARIES ${LIBMLTPLUS_LIBRARY}) else(LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR) @@ -47,14 +63,10 @@ endif(LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR) if(LIBMLT_FOUND) set(LIBMLT_VERSION ${MLT_VERSION}) if(NOT LIBMLT_FIND_QUIETLY) - message(STATUS "MLT install path: ${MLT_PREFIX}") - message(STATUS "MLT includes: ${LIBMLT_INCLUDE_DIR}") - message(STATUS "MLT library: ${LIBMLT_LIBRARY}") - message(STATUS "MLT++ includes: ${LIBMLTPLUS_INCLUDE_DIR}") - message(STATUS "MLT++ library: ${LIBMLTPLUS_LIBRARY}") + message(STATUS "Found MLT: ${LIBMLT_LIBRARY}") endif(NOT LIBMLT_FIND_QUIETLY) else(LIBMLT_FOUND) if(LIBMLT_FIND_REQUIRED) - message(FATAL_ERROR "Could not find MLT library") + message(FATAL_ERROR "Could not find MLT") endif(LIBMLT_FIND_REQUIRED) -endif(LIBMLT_FOUND) \ No newline at end of file +endif(LIBMLT_FOUND) -- 2.39.5