git-svn-id: svn://db.shs.com.ru/libs@308 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -412,7 +412,7 @@ macro(qt_target_link_libraries _NAME)
|
|||||||
foreach(_i ${ARGN})
|
foreach(_i ${ARGN})
|
||||||
set(_ind -1)
|
set(_ind -1)
|
||||||
list(FIND QT_MULTILIB_LIST "${_i}" _ind)
|
list(FIND QT_MULTILIB_LIST "${_i}" _ind)
|
||||||
if (_ind GREATER_EQUAL 0)
|
if (_ind GREATER -1)
|
||||||
_qt_multitarget_suffix_(_TS ${_i} ${_v})
|
_qt_multitarget_suffix_(_TS ${_i} ${_v})
|
||||||
list(APPEND _ARGS ${_i}${_TS})
|
list(APPEND _ARGS ${_i}${_TS})
|
||||||
else()
|
else()
|
||||||
@@ -481,7 +481,7 @@ macro(qt_install)
|
|||||||
else()
|
else()
|
||||||
set(_ind -1)
|
set(_ind -1)
|
||||||
string(FIND "${_i}" "QtPlugins" _ind)
|
string(FIND "${_i}" "QtPlugins" _ind)
|
||||||
if (_ind GREATER_EQUAL 0)
|
if (_ind GREATER -1)
|
||||||
string(REPLACE "QtPlugins" "${Qt${_v}_PLUGINS_DIR}" _o "${_i}")
|
string(REPLACE "QtPlugins" "${Qt${_v}_PLUGINS_DIR}" _o "${_i}")
|
||||||
set(_INST_LIST ${_INST_LIST} "${_o}")
|
set(_INST_LIST ${_INST_LIST} "${_o}")
|
||||||
else()
|
else()
|
||||||
|
|||||||
Reference in New Issue
Block a user