summaryrefslogtreecommitdiffstats
path: root/src/qt.mk
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2015-10-04 07:39:06 (GMT)
committerTony Theodore <tonyt@logyst.com>2015-10-04 07:39:06 (GMT)
commitdd34bab1b47e929b7becb5f1fd9cee9696cef44b (patch)
treec8e7b6a381066fb1f3f5bc43cad397bb9e5c977a /src/qt.mk
parentdb8bd3763aa422d62de8e4d5e2d97cf3d90f2e79 (diff)
downloadmxe-dd34bab1b47e929b7becb5f1fd9cee9696cef44b.zip
mxe-dd34bab1b47e929b7becb5f1fd9cee9696cef44b.tar.gz
mxe-dd34bab1b47e929b7becb5f1fd9cee9696cef44b.tar.bz2
qt: add cmake test
workaround in #857 allows this to build. see also #852, a complete solution that covers Qt5 is required
Diffstat (limited to 'src/qt.mk')
-rw-r--r--src/qt.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/qt.mk b/src/qt.mk
index 89ab27e..71536fe 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -122,10 +122,17 @@ define $(PKG)_BUILD
# setup cmake toolchain
echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/$(TARGET)/qt/bin/qmake)' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
- # fix static linking errors of QtGui to missing lcms2 and lzma
+ # 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'
+ echo 'set(MNG_LIBRARY mng lcms2 lzma)' >> '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
+ # test cmake
+ mkdir '$(1).test-cmake'
+ cd '$(1).test-cmake' && '$(TARGET)-cmake' \
+ -DPKG=$(PKG) \
+ -DPKG_VERSION=$($(PKG)_VERSION) \
+ '$(PWD)/src/cmake/test'
+ $(MAKE) -C '$(1).test-cmake' -j 1 install
endef
$(PKG)_BUILD_SHARED = $(subst -static ,-shared ,\