diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-10-18 23:24:22 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-10-18 23:24:22 (GMT) |
| commit | 614dad4e29f63c49193ab1043f313f18035c905a (patch) | |
| tree | a3f0a52087f718b38d58f53546b610baea9952e5 | |
| parent | e9a53febb8be22c30dab1afb20c27ab9567340d6 (diff) | |
| download | mxe-614dad4e29f63c49193ab1043f313f18035c905a.zip mxe-614dad4e29f63c49193ab1043f313f18035c905a.tar.gz mxe-614dad4e29f63c49193ab1043f313f18035c905a.tar.bz2 | |
set QT_QMAKE_EXECUTABLE in cmake toolchain file
When this is not set, cmake might use the host's qmake.
Problem observed bulding package openscenegraph.
| -rw-r--r-- | src/gcc.mk | 1 | ||||
| -rw-r--r-- | src/qjson.mk | 1 |
2 files changed, 1 insertions, 1 deletions
@@ -72,6 +72,7 @@ define $(PKG)_BUILD echo 'set(CMAKE_CXX_COMPILER $(PREFIX)/bin/$(TARGET)-g++)'; \ echo 'set(CMAKE_RC_COMPILER $(PREFIX)/bin/$(TARGET)-windres)'; \ echo 'set(PKG_CONFIG_EXECUTABLE $(PREFIX)/bin/$(TARGET)-pkg-config)'; \ + echo 'set(QT_QMAKE_EXECUTABLE $(PREFIX)/bin/$(TARGET)-qmake)'; \ echo 'set(CMAKE_INSTALL_PREFIX $(PREFIX)/$(TARGET) CACHE PATH "Installation Prefix")'; \ echo 'set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug|Release|RelWithDebInfo|MinSizeRel")') \ > '$(CMAKE_TOOLCHAIN_FILE)' diff --git a/src/qjson.mk b/src/qjson.mk index dfd8616..9a9c88d 100644 --- a/src/qjson.mk +++ b/src/qjson.mk @@ -22,7 +22,6 @@ define $(PKG)_BUILD mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DQT_QMAKE_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-qmake' \ -DCMAKE_BUILD_TYPE=Release \ -DLIBTYPE=STATIC |