[oe-commits] Otavio Salvador : cmake.bbclass: use QT_CONF_PATH to support Qt4 projects

git version control git at git.openembedded.org
Wed Feb 23 21:09:40 UTC 2011


Module: openembedded.git
Branch: master
Commit: 5bba90caadb62bc69b67333dc46072ccdfbf592b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5bba90caadb62bc69b67333dc46072ccdfbf592b

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Wed Feb 23 21:07:17 2011 +0000

cmake.bbclass: use QT_CONF_PATH to support Qt4 projects

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 classes/cmake.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index 97347f2..d2d1c66 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -44,6 +44,8 @@ cmake_do_generate_toolchain_file() {
   echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )" >> ${WORKDIR}/toolchain.cmake
 # Use native cmake modules
   echo "set( CMAKE_MODULE_PATH ${STAGING_DIR_NATIVE}/usr/share/cmake-2.8/Modules/ )" >> ${WORKDIR}/toolchain.cmake
+# Use qt.conf settings
+  echo "set( ENV{QT_CONF_PATH} ${WORKDIR}/qt.conf )" >> ${WORKDIR}/toolchain.cmake
 }
 
 addtask generate_toolchain_file after do_patch before do_configure





More information about the Openembedded-commits mailing list