summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2015-07-20 00:30:16 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2015-07-20 00:30:16 (GMT)
commitc4c8dc3c40ac01f08ef396a699cbe07b67638adb (patch)
treec6e1cbc4f496994ebf6d5614cf41593e6a3c650c
parent8b273439af80bc9501f905d10b722228acc4ea1c (diff)
parentb9100cfce17d2bb543b69b03c0572883858dbe78 (diff)
downloadmxe-c4c8dc3c40ac01f08ef396a699cbe07b67638adb.zip
mxe-c4c8dc3c40ac01f08ef396a699cbe07b67638adb.tar.gz
mxe-c4c8dc3c40ac01f08ef396a699cbe07b67638adb.tar.bz2
Merge pull request #584 from uwehermann/qt5_cmake
qtbase: Append Qt5 cmake dir to CMAKE_PREFIX_PATH.
-rw-r--r--src/qtbase.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qtbase.mk b/src/qtbase.mk
index 24203ac..90420e2 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -78,6 +78,10 @@ define $(PKG)_BUILD
-I'$(1)/test-$(PKG)-pkgconfig' \
`'$(TARGET)-pkg-config' Qt5Widgets --cflags --libs`
+ # setup cmake toolchain
+ $(SED) -i '/CMAKE_PREFIX_PATH/d' '$(CMAKE_TOOLCHAIN_FILE)'
+ echo 'set(CMAKE_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_PREFIX_PATH})' >> '$(CMAKE_TOOLCHAIN_FILE)'
+
# batch file to run test programs
(printf 'set PATH=..\\lib;..\\qt5\\bin;..\\qt5\\lib;%%PATH%%\r\n'; \
printf 'set QT_QPA_PLATFORM_PLUGIN_PATH=..\\qt5\\plugins\r\n'; \