SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2017-08-10 12:14:06 +00:00
parent acdc307e9d
commit 086e969b02
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qad/FindQAD.cmake
View File

@@ -26,6 +26,8 @@ foreach(_Q ${_QAD_LIBS})
else()
foreach(_v ${_QT_VERSIONS_})
find_library(QAD${_v}_${_QU}_LIBRARY qad_${_Q}${_v} ${_SEARCH_DIR})
set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v})
set(MULTILIB_${_Q}_SUFFIX_Qt${_v} ${_v} PARENT_SCOPE)
endforeach()
endif()
#message(STATUS "Library ${_Q} (${_QU}) -> ${QAD_${_QU}_LIBRARY} found in ${_SEARCH_DIR}")

15
qad/QtWraps.cmake
View File

@@ -4,6 +4,7 @@ set(_QT_VERSIONS_ 4 5)
foreach(_v ${_QT_VERSIONS_})
if (NOT DEFINED TARGET_SUFFIX_Qt${_v})
set(TARGET_SUFFIX_Qt${_v} "${_v}")
set(MULTILIB_SUFFIX_Qt${_v} "${_v}")
endif()
set(MOC_INC_Qt${_v})
endforeach()
@@ -382,11 +383,20 @@ macro(qt_add_library _NAME)
endmacro()
macro(_qt_multitarget_suffix_ _OUT _IN _v)
if (NOT "x${MULTILIB_${_IN}_SUFFIX_Qt${_v}}" STREQUAL "x")
set(${_OUT} ${_IN}${MULTILIB_${_IN}_SUFFIX_Qt${_v}})
else()
set(${_OUT} ${_IN}${MULTILIB_SUFFIX_Qt${_v}})
endif()
endmacro()
# usage: qt_target_link_libraries(<target> ... <item> ...)
# link targets for founded Qt versions, target names is <name><TARGET_SUFFIX_Qt?>
# all needed Qt libraries automatic added to corresponding targets
# if QT_MULTILIB_LIST contains some linking library, to it name automatic
# add <TARGET_SUFFIX_Qt?>
# add <MULTILIB_SUFFIX_Qt?> or individual <MULTILIB_>libname<_SUFFIX_Qt?>
macro(qt_target_link_libraries _NAME)
foreach(_v ${_QT_VERSIONS_})
if (LOCAL_FOUND${_v})
@@ -396,7 +406,8 @@ macro(qt_target_link_libraries _NAME)
set(_ind -1)
list(FIND QT_MULTILIB_LIST "${_i}" _ind)
if (_ind GREATER_EQUAL 0)
list(APPEND _ARGS ${_i}${TARGET_SUFFIX_Qt${_v}})
_qt_multitarget_suffix_(_TS ${_i} ${_v})
list(APPEND _ARGS ${_i}${_TS})
else()
list(APPEND _ARGS ${_i})
endif()