git-svn-id: svn://db.shs.com.ru/libs@307 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -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_})
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user