diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2016-01-17 12:47:54 (GMT) |
|---|---|---|
| committer | Boris Nagaev <bnagaev@gmail.com> | 2016-01-17 13:11:32 (GMT) |
| commit | 9d09e67443f318f54e0f93a4018e008743e4c994 (patch) | |
| tree | aea1a5f1777b8244cbd06a95dbb862760d5f35ff /src | |
| parent | eb43c1c0add6fd33b242dedd911801d84c113a93 (diff) | |
| download | mxe-9d09e67443f318f54e0f93a4018e008743e4c994.zip mxe-9d09e67443f318f54e0f93a4018e008743e4c994.tar.gz mxe-9d09e67443f318f54e0f93a4018e008743e4c994.tar.bz2 | |
qt5: add test that cmake works with QUiLoader
See https://github.com/mxe/mxe/issues/1185
Diffstat (limited to 'src')
| -rw-r--r-- | src/qttools-test/CMakeLists.txt | 31 | ||||
| -rw-r--r-- | src/qttools-test/mxe-cmake-qtuitools.cpp | 11 | ||||
| -rw-r--r-- | src/qttools.mk | 7 |
3 files changed, 49 insertions, 0 deletions
diff --git a/src/qttools-test/CMakeLists.txt b/src/qttools-test/CMakeLists.txt new file mode 100644 index 0000000..888bf25 --- /dev/null +++ b/src/qttools-test/CMakeLists.txt @@ -0,0 +1,31 @@ +# This file is part of MXE. +# See index.html for further information. + +# Source: https://github.com/mxe/mxe/issues/1185 + +cmake_minimum_required(VERSION 3.0) +find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui UiTools) + +include_directories(${Qt5UiTools_INCLUDE_DIRS}) +add_executable(mxe-cmake-qtuitools mxe-cmake-qtuitools.cpp) +# NB: Qt5Widgets, Qt5Gui, Qt5Core must be given separately; otherwise they are +# appended automatically at the end, making it impossible to satisfy all the +# other implicit dependencies (opengl, harfbuzz, etc.) +target_link_libraries( + mxe-cmake-qtuitools + ${Qt5UiTools_LIBRARIES} + ${Qt5Widgets_LIBRARIES} + ${Qt5Gui_LIBRARIES} + ${Qt5Core_LIBRARIES} + opengl32 + harfbuzz + jpeg + png + glib-2.0 + winmm + ws2_32 + intl + iconv + pcre16 + z +) diff --git a/src/qttools-test/mxe-cmake-qtuitools.cpp b/src/qttools-test/mxe-cmake-qtuitools.cpp new file mode 100644 index 0000000..dc4eadb --- /dev/null +++ b/src/qttools-test/mxe-cmake-qtuitools.cpp @@ -0,0 +1,11 @@ +// This file is part of MXE. +// See index.html for further information. + +// Source: https://github.com/mxe/mxe/issues/1185 + +#include <QUiLoader> + +int main() { + QUiLoader l; + return 0; +} diff --git a/src/qttools.mk b/src/qttools.mk index bf5fe24..a6bce29 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -18,5 +18,12 @@ define $(PKG)_BUILD cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install + + # test QUiLoader + mkdir '$(1)'.test + cd '$(1)'.test && '$(TARGET)-cmake' '$(PWD)/src/qttools-test' + $(MAKE) -C '$(1)'.test + cp '$(1)'.test/mxe-cmake-qtuitools.exe \ + '$(PREFIX)/$(TARGET)/bin/test-qttools.exe' endef |