QtWraps.cmake: fint_qt macro now can't find Qt5Huilo
This commit is contained in:
@@ -185,7 +185,9 @@ macro(find_qt)
|
||||
endif()
|
||||
endforeach()
|
||||
if (NOT _FOUND_NEED)
|
||||
list(APPEND _QCOMP "${_i}")
|
||||
if (NOT "x${_i}" STREQUAL "xQUIET")
|
||||
list(APPEND _QCOMP "${_i}")
|
||||
endif()
|
||||
endif()
|
||||
endforeach()
|
||||
if (NOT _NEED_SOME)
|
||||
@@ -224,10 +226,11 @@ macro(find_qt)
|
||||
set(CMAKE_SHARED_MODULE_SUFFIX_C ".so")
|
||||
set(CMAKE_SHARED_LIBRARY_SUFFIX_C ".so")
|
||||
endif()
|
||||
if (Qt5_FOUND)
|
||||
if (Qt5Core_FOUND)
|
||||
set(LOCAL_FOUND5 1)
|
||||
set(_Qt5Modules)
|
||||
foreach(m ${_QCOMP})
|
||||
#message(STATUS "Qt5${m}")
|
||||
if (${Qt5${m}_FOUND})
|
||||
set(__lib ${Qt5${m}_LIBRARIES})
|
||||
if (DEFINED ANDROID_PLATFORM)
|
||||
@@ -239,7 +242,7 @@ macro(find_qt)
|
||||
list(APPEND Qt5_INCLUDES ${Qt5${m}_INCLUDE_DIRS})
|
||||
list(APPEND Qt5_LIBRARIES ${__lib})
|
||||
else()
|
||||
if (NOT _QUIET)
|
||||
if (NOT "x${_QUIET}" STREQUAL "xQUIET")
|
||||
message(FATAL_ERROR "Qt5${m} NOT FOUND")
|
||||
endif()
|
||||
endif()
|
||||
@@ -273,7 +276,7 @@ macro(find_qt)
|
||||
if (NOT _QT5_MSG)
|
||||
message(STATUS "Found Qt5: ${_Qt5_qmake} (version \"${Qt5_VERSION}\")")
|
||||
set(_QT5_MSG 1 CACHE BOOL "msg_qt5" FORCE)
|
||||
#message(STATUS "Found Qt5 modules: ${_Qt5Modules}")
|
||||
message(STATUS "Found Qt5 modules: ${_Qt5Modules}")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user