Merge pull request #1833 from muellni/qt4_cmake_cache_qmake

qt: set CMake QT_QMAKE_EXECUTABLE variable to cache
This commit is contained in:
Tony Theodore 2017-07-22 17:23:48 +10:00 committed by GitHub
commit 72e622caa6
1 changed files with 1 additions and 1 deletions

View File

@ -131,7 +131,7 @@ define $(PKG)_BUILD
`'$(TARGET)-pkg-config' QtGui --cflags --libs`
# setup cmake toolchain
echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake CACHE FILEPATH "Qt4 qmake executable")' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
# fix static linking errors of QtGui to missing lcms2 and lzma
# introduced by poor libmng linking
echo 'set(MNG_LIBRARY mng lcms2 lzma)' >> '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'