From 9407cab3f312fdf77a998249e247ea468a430b12 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Mon, 20 Jul 2015 08:32:11 +0800 Subject: Set CMAKE_SYSTEM_PREFIX_PATH and Qt5_DIR in CMake toolchain --- src/qtbase.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qtbase.mk b/src/qtbase.mk index 90420e2..a015d38 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -79,8 +79,10 @@ define $(PKG)_BUILD `'$(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)' + $(SED) -i '/CMAKE_SYSTEM_PREFIX_PATH/d' '$(CMAKE_TOOLCHAIN_FILE)' + echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_SYSTEM_PREFIX_PATH})' >> '$(CMAKE_TOOLCHAIN_FILE)' + $(SED) -i '/Qt5_DIR/d' '$(CMAKE_TOOLCHAIN_FILE)' + echo 'set(Qt5_DIR "$(PREFIX)/$(TARGET)/qt5/lib/cmake/Qt5")' >> '$(CMAKE_TOOLCHAIN_FILE)' # batch file to run test programs (printf 'set PATH=..\\lib;..\\qt5\\bin;..\\qt5\\lib;%%PATH%%\r\n'; \ -- cgit v0.12