diff --git a/qad/cmake/QtWraps.cmake b/qad/cmake/QtWraps.cmake index 25f4744..4f87573 100644 --- a/qad/cmake/QtWraps.cmake +++ b/qad/cmake/QtWraps.cmake @@ -651,19 +651,26 @@ macro(qt_install_lang _NAME _dest_tag _DEST) endif() get_target_property(_LL ${_target} LINK_LIBRARIES) foreach (_L ${_LL}) - get_filename_component(_libname "${_L}" NAME) + get_filename_component(_libname "${_L}" NAME_WE) #message("depend on ${_libname}") if ("${_libname}" MATCHES "Qt${_v}::.*") string(SUBSTRING "${_libname}" 5 -1 _libname) string(TOLOWER "${_libname}" _libname) #message("qt lib \"${_libname}\"") list(APPEND _qt_libs qt${_libname}) - elseif ("${_libname}" MATCHES "qad_.*${_v}") - string(LENGTH ${_libname} _sl) - math(EXPR _sl ${_sl}-1) - string(SUBSTRING ${_libname} 0 ${_sl} _libname) - #message("qad lib \"${_libname}\"") - list(APPEND _qt_libs ${_libname}) + else() + if ("${_libname}" MATCHES "lib.*") + string(LENGTH ${_libname} _sl) + math(EXPR _sl ${_sl}-3) + string(SUBSTRING ${_libname} 3 ${_sl} _libname) + endif() + if ("${_libname}" MATCHES "qad_.*${_v}") + string(LENGTH ${_libname} _sl) + math(EXPR _sl ${_sl}-1) + string(SUBSTRING ${_libname} 0 ${_sl} _libname) + #message("qad lib \"${_libname}\"") + list(APPEND _qt_libs ${_libname}) + endif() endif() endforeach() if (NOT "x${_qt_libs}" STREQUAL "x")