Mercurial > mxe-octave

changeset 2015:b289b25fa9c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mark Brand <mabrand@mabrand.nl>
date Wed, 19 Oct 2011 01:24:22 +0200
parents 1093671745df
children 0b602046f9dd
files src/gcc.mk src/qjson.mk
diffstat 2 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/gcc.mk	Wed Oct 19 00:18:31 2011 +0200
+++ b/src/gcc.mk	Wed Oct 19 01:24:22 2011 +0200
@@ -72,6 +72,7 @@
      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)'
--- a/src/qjson.mk	Wed Oct 19 00:18:31 2011 +0200
+++ b/src/qjson.mk	Wed Oct 19 01:24:22 2011 +0200
@@ -22,7 +22,6 @@
     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