SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Бычков Андрей
2017-10-11 14:19:25 +00:00
parent e18d419d3e
commit 9f46ee6961
11 changed files with 344 additions and 1384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
qad/QtWraps.cmake
View File

@@ -29,6 +29,7 @@ macro(find_qt)
set(Qt${_v}_LIBRARIES)
set(Qt${_v}_BIN)
set(Qt${_v}_PLUGINS_DIR)
set(Qt${_v}_LANG_DIR)
endforeach()
set(_NEED_SOME 0)
foreach(_i ${ARGN})
@@ -64,6 +65,7 @@ macro(find_qt)
endif()
endforeach()
set(Qt4_PLUGINS_DIR ${QT_PLUGINS_DIR})
set(Qt4_LANG_DIR ${Qt4_BIN}/../translations)
endif()
endif()
if (_NEED5)
@@ -107,6 +109,7 @@ macro(find_qt)
if (APPLE)
list(APPEND MOC_INC_Qt5 "-F${_qt5_root}/lib")
endif()
set(Qt5_LANG_DIR ${Qt5_BIN}/../translations)
if (NOT _QT5_MSG)
message(STATUS "Found Qt5: ${_Qt5_qmake} (found version \"${Qt5_VERSION}\")")
set(_QT5_MSG 1 CACHE BOOL "msg_qt5" FORCE)
@@ -424,6 +427,8 @@ endmacro()
# install targets for founded Qt versions
# if DESTINATION set to "QtBin" files will be installed
# to corresponding Qt binary directory
# if DESTINATION set to "QtLang" files will be installed
# to corresponding Qt translation directory
# if DESTINATION starts with "QtPlugins" files will be installed
# to corresponding Qt plugins directory
macro(qt_install)
@@ -447,13 +452,17 @@ macro(qt_install)
if ("x${_i}" STREQUAL "xQtBin")
set(_INST_LIST ${_INST_LIST} "${Qt${_v}_BIN}")
else()
set(_ind -1)
string(FIND "${_i}" "QtPlugins" _ind)
if (_ind GREATER_EQUAL 0)
string(REPLACE "QtPlugins" "${Qt${_v}_PLUGINS_DIR}" _o "${_i}")
set(_INST_LIST ${_INST_LIST} "${_o}")
if ("x${_i}" STREQUAL "xQtLang")
set(_INST_LIST ${_INST_LIST} "${Qt${_v}_LANG_DIR}")
else()
set(_INST_LIST ${_INST_LIST} ${_i})
set(_ind -1)
string(FIND "${_i}" "QtPlugins" _ind)
if (_ind GREATER_EQUAL 0)
string(REPLACE "QtPlugins" "${Qt${_v}_PLUGINS_DIR}" _o "${_i}")
set(_INST_LIST ${_INST_LIST} "${_o}")
else()
set(_INST_LIST ${_INST_LIST} ${_i})
endif()
endif()
endif()
else()