From 387c5960a595b922fbb017b5de37feb318ae2dad Mon Sep 17 00:00:00 2001
From: Robert Schuster <rschus@entw2.(none)>
Date: Thu, 12 Mar 2009 16:08:29 +0100
Subject: cmake.bbclass: Allow overriding path-to-source argument for cmake
 call.

---
 classes/cmake.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'classes/cmake.bbclass')

diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index faa4768d90..8fd25cd7a5 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -3,8 +3,11 @@ DEPENDS += " cmake-native "
 # We want the staging and installing functions from autotools
 inherit autotools
 
+OECMAKE_SOURCEPATH ?= "."
+
 cmake_do_configure() {
-     cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \
+     cmake ${OECMAKE_SOURCEPATH} \
+     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \
      -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} \
      ${EXTRA_OECMAKE}
 }
-- 
cgit v1.2.3


From a17689c0c413caa2e59303f5a4fab0267200ea2f Mon Sep 17 00:00:00 2001
From: Robert Schuster <rschus@entw2.(none)>
Date: Fri, 20 Mar 2009 13:18:02 +0100
Subject: cmake.bbclass: Allow out of tree builds with cmake.

---
 classes/cmake.bbclass | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'classes/cmake.bbclass')

diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index 8fd25cd7a5..7907f94cc6 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -3,13 +3,25 @@ DEPENDS += " cmake-native "
 # We want the staging and installing functions from autotools
 inherit autotools
 
+# Use in-tree builds by default but allow this to be changed
+# since some packages do not support them (e.g. llvm 2.5).
 OECMAKE_SOURCEPATH ?= "."
 
+# If declaring this, make sure you also set EXTRA_OEMAKE to
+# "-C ${OECMAKE_BUILDPATH}". So it will run the right makefiles.
+OECMAKE_BUILDPATH ?= ""
+
 cmake_do_configure() {
-     cmake ${OECMAKE_SOURCEPATH} \
-     -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \
-     -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} \
-     ${EXTRA_OECMAKE}
+  if [ ${OECMAKE_BUILDPATH} ]
+  then
+    mkdir ${OECMAKE_BUILDPATH}
+    cd ${OECMAKE_BUILDPATH}
+  fi
+
+  cmake ${OECMAKE_SOURCEPATH} \
+    -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \
+    -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} \
+    ${EXTRA_OECMAKE}
 }
 
 EXPORT_FUNCTIONS do_configure
-- 
cgit v1.2.3


From 4b9f02e641d067ed20081cdb3dd97858520676a6 Mon Sep 17 00:00:00 2001
From: Robert Schuster <rschus@entw2.(none)>
Date: Fri, 20 Mar 2009 13:37:16 +0100
Subject: cmake.bbclass: Put mandatory cmake option to end

---
 classes/cmake.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'classes/cmake.bbclass')

diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index 7907f94cc6..b5b7b8655b 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -19,9 +19,10 @@ cmake_do_configure() {
   fi
 
   cmake ${OECMAKE_SOURCEPATH} \
-    -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \
+    -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
     -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} \
-    ${EXTRA_OECMAKE}
+    ${EXTRA_OECMAKE} \
+    -Wno-dev
 }
 
 EXPORT_FUNCTIONS do_configure
-- 
cgit v1.2.3