From c26db65a64fe6382f1f9d66f975dc1b128346a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 26 Oct 2017 21:32:56 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@307 a8b55f48-bf90-11e4-a774-851b48703e85 --- CMakeLists.txt | 2 +- qad/QtWraps.cmake | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cdcd39..e7b74dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ endif() set(QAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/qad) include(qad/QtWraps.cmake) -find_qt(Core) +find_qt(Core QUIET) set(QtVersions) set(SomeQtFound 0) foreach(_v ${_QT_VERSIONS_}) diff --git a/qad/QtWraps.cmake b/qad/QtWraps.cmake index ff37865..0bbb707 100644 --- a/qad/QtWraps.cmake +++ b/qad/QtWraps.cmake @@ -32,6 +32,7 @@ macro(find_qt) set(Qt${_v}_LANG_DIR) endforeach() set(_NEED_SOME 0) + set(_QUIET) foreach(_i ${ARGN}) set(_FOUND_NEED 0) foreach(_v ${_QT_VERSIONS_}) @@ -40,6 +41,9 @@ macro(find_qt) set(_NEED_SOME 1) set(_FOUND_NEED 1) endif() + if ("x${_i}" STREQUAL "xQUIET") + set(_QUIET QUIET) + endif() endforeach() if (NOT _FOUND_NEED) list(APPEND _QCOMP "${_i}") @@ -52,7 +56,7 @@ macro(find_qt) endif() list(REMOVE_DUPLICATES _QCOMP) if (_NEED4) - find_package(Qt4) + find_package(Qt4 ${_QUIET}) if (Qt4_FOUND) set(LOCAL_FOUND4 1) get_filename_component(Qt4_BIN ${QT_QMAKE_EXECUTABLE} PATH) @@ -73,7 +77,7 @@ macro(find_qt) #if (Qt5_FOUND) # set(_MSG 0) #endif() - find_package(Qt5 COMPONENTS LinguistTools UiPlugin Widgets ${_QCOMP}) + find_package(Qt5 COMPONENTS LinguistTools UiPlugin Widgets ${_QCOMP} ${_QUIET}) if (Qt5_FOUND) set(LOCAL_FOUND5 1) #cmake_policy(SET CMP0020 NEW)