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

This commit is contained in:
2020-03-10 20:38:35 +00:00
parent e2e8854c34
commit ff5335dbe6

View File

@@ -49,14 +49,14 @@ foreach(_Q ${_QAD_LIBS})
list(APPEND QAD_INCLUDES ${QAD_DIR}/${_Q}) list(APPEND QAD_INCLUDES ${QAD_DIR}/${_Q})
else() else()
foreach(_v ${_QT_VERSIONS_}) foreach(_v ${_QT_VERSIONS_})
find_library(QAD${_v}_${_QU}_LIBRARY qad_${_Q}${_v} ${_SEARCH_DIR}) find_library(QAD${_v}_${_QU}_LIBRARY qad_${_Q}${_v} HINTS ${_SEARCH_DIR})
set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v}) set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v})
if(hasParent) if(hasParent)
set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE) set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE)
endif() endif()
endforeach() endforeach()
endif() endif()
#message(STATUS "Library ${_Q} (${_QU}) -> ${QAD_${_QU}_LIBRARY} found in ${_SEARCH_DIR}") #message(STATUS "Library qad_${_Q}5 (${_QU}) -> ${QAD5_${_QU}_LIBRARY} found in ${_SEARCH_DIR}")
list(APPEND QT_MULTILIB_LIST qad_${_Q}) list(APPEND QT_MULTILIB_LIST qad_${_Q})
endforeach() endforeach()
list(APPEND QT_MULTILIB_LIST qglview) list(APPEND QT_MULTILIB_LIST qglview)