diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-07-22 07:23:48 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 07:23:48 (GMT) |
| commit | 72e622caa63af999823bb22bd770f33e7167f627 (patch) | |
| tree | 50517f0508a1a6d487cdf713b838a07816a676f0 | |
| parent | e30dd4ae554cdc0a6360f062ea63f3d6c4549365 (diff) | |
| parent | 941541e551fe92699e09ad39f40131e7b682e0a9 (diff) | |
| download | mxe-72e622caa63af999823bb22bd770f33e7167f627.zip mxe-72e622caa63af999823bb22bd770f33e7167f627.tar.gz mxe-72e622caa63af999823bb22bd770f33e7167f627.tar.bz2 | |
Merge pull request #1833 from muellni/qt4_cmake_cache_qmake
qt: set CMake QT_QMAKE_EXECUTABLE variable to cache
| -rw-r--r-- | src/qt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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' |