diff options
| author | Philip Lowman <philip@yhbt.com> | 2009-01-30 20:13:07 (GMT) |
|---|---|---|
| committer | Philip Lowman <philip@yhbt.com> | 2009-01-30 20:13:07 (GMT) |
| commit | 1569f5d0e46e7f763326b8e0e9f6529e3a0247d6 (patch) | |
| tree | d833f17c2bf2357f21d87f86d6928457828950f6 | |
| parent | 901b4b6c3f4e44ba9286236181da44b1e967e5e8 (diff) | |
| download | CMake-1569f5d0e46e7f763326b8e0e9f6529e3a0247d6.zip CMake-1569f5d0e46e7f763326b8e0e9f6529e3a0247d6.tar.gz CMake-1569f5d0e46e7f763326b8e0e9f6529e3a0247d6.tar.bz2 | |
BUG: Fix other modules not respecting QUIET and REQUIRED
| -rw-r--r-- | Modules/FindDoxygen.cmake | 6 | ||||
| -rw-r--r-- | Modules/FindOpenThreads.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindProducer.cmake | 9 |
3 files changed, 6 insertions, 11 deletions
diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index fff7fce..2cbe7b4 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -64,7 +64,7 @@ FIND_PROGRAM(DOXYGEN_EXECUTABLE ) include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(DOXYGEN DEFAULT_MSG DOXYGEN_EXECUTABLE) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Doxygen DEFAULT_MSG DOXYGEN_EXECUTABLE) # # Find Dot... @@ -85,10 +85,8 @@ IF(NOT DOXYGEN_SKIP_DOT) DOC "Graphviz Dot tool for using Doxygen" ) - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(DOXYGEN_DOT DEFAULT_MSG DOXYGEN_DOT_EXECUTABLE) - if(DOXYGEN_DOT_EXECUTABLE) + set(DOXYGEN_DOT_FOUND TRUE) # The Doxyfile wants the path to Dot, not the entire path and executable get_filename_component(DOXYGEN_DOT_PATH "${DOXYGEN_DOT_EXECUTABLE}" PATH CACHE) endif() diff --git a/Modules/FindOpenThreads.cmake b/Modules/FindOpenThreads.cmake index 13d101c..e57f750 100644 --- a/Modules/FindOpenThreads.cmake +++ b/Modules/FindOpenThreads.cmake @@ -137,5 +137,5 @@ else() endif() include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENTHREADS DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenThreads DEFAULT_MSG OPENTHREADS_LIBRARY OPENTHREADS_INCLUDE_DIR) diff --git a/Modules/FindProducer.cmake b/Modules/FindProducer.cmake index db51d3a..d8151ef 100644 --- a/Modules/FindProducer.cmake +++ b/Modules/FindProducer.cmake @@ -64,9 +64,6 @@ FIND_LIBRARY(PRODUCER_LIBRARY /opt ) -SET(PRODUCER_FOUND "NO") -IF(PRODUCER_LIBRARY AND PRODUCER_INCLUDE_DIR) - SET(PRODUCER_FOUND "YES") -ENDIF(PRODUCER_LIBRARY AND PRODUCER_INCLUDE_DIR) - - +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Producer DEFAULT_MSG + PRODUCER_LIBRARY PRODUCER_INCLUDE_DIR) |