SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@307 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2017-10-26 21:32:56 +00:00
parent 0778d092e8
commit c26db65a64
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -70,7 +70,7 @@ endif()
set(QAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/qad) set(QAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/qad)
include(qad/QtWraps.cmake) include(qad/QtWraps.cmake)
find_qt(Core) find_qt(Core QUIET)
set(QtVersions) set(QtVersions)
set(SomeQtFound 0) set(SomeQtFound 0)
foreach(_v ${_QT_VERSIONS_}) foreach(_v ${_QT_VERSIONS_})

8
qad/QtWraps.cmake
View File

@@ -32,6 +32,7 @@ macro(find_qt)
set(Qt${_v}_LANG_DIR) set(Qt${_v}_LANG_DIR)
endforeach() endforeach()
set(_NEED_SOME 0) set(_NEED_SOME 0)
set(_QUIET)
foreach(_i ${ARGN}) foreach(_i ${ARGN})
set(_FOUND_NEED 0) set(_FOUND_NEED 0)
foreach(_v ${_QT_VERSIONS_}) foreach(_v ${_QT_VERSIONS_})
@@ -40,6 +41,9 @@ macro(find_qt)
set(_NEED_SOME 1) set(_NEED_SOME 1)
set(_FOUND_NEED 1) set(_FOUND_NEED 1)
endif() endif()
if ("x${_i}" STREQUAL "xQUIET")
set(_QUIET QUIET)
endif()
endforeach() endforeach()
if (NOT _FOUND_NEED) if (NOT _FOUND_NEED)
list(APPEND _QCOMP "${_i}") list(APPEND _QCOMP "${_i}")
@@ -52,7 +56,7 @@ macro(find_qt)
endif() endif()
list(REMOVE_DUPLICATES _QCOMP) list(REMOVE_DUPLICATES _QCOMP)
if (_NEED4) if (_NEED4)
find_package(Qt4) find_package(Qt4 ${_QUIET})
if (Qt4_FOUND) if (Qt4_FOUND)
set(LOCAL_FOUND4 1) set(LOCAL_FOUND4 1)
get_filename_component(Qt4_BIN ${QT_QMAKE_EXECUTABLE} PATH) get_filename_component(Qt4_BIN ${QT_QMAKE_EXECUTABLE} PATH)
@@ -73,7 +77,7 @@ macro(find_qt)
#if (Qt5_FOUND) #if (Qt5_FOUND)
# set(_MSG 0) # set(_MSG 0)
#endif() #endif()
find_package(Qt5 COMPONENTS LinguistTools UiPlugin Widgets ${_QCOMP}) find_package(Qt5 COMPONENTS LinguistTools UiPlugin Widgets ${_QCOMP} ${_QUIET})
if (Qt5_FOUND) if (Qt5_FOUND)
set(LOCAL_FOUND5 1) set(LOCAL_FOUND5 1)
#cmake_policy(SET CMP0020 NEW) #cmake_policy(SET CMP0020 NEW)