cmake.bbclass: sync from openembedded

this fixes:
  - toolchain detection error (e.g. ar and ranlib)

changes from openembedded:
  - reformatting
  - cmake modules search path
  - use 'cat <<EOF' instead of echos for clarity

Signed-off-by: Qing He <qing.he@intel.com>

1 files changed, 51 insertions, 48 deletions

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 74e242d738..a4b0c126a2 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -25,69 +25,72 @@ OECMAKE_C_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} -DNDEBUG"
 OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} -DNDEBUG"
 
 cmake_do_generate_toolchain_file() {
+        cat > ${WORKDIR}/toolchain.cmake <<EOF
 # CMake system name must be something like "Linux".
 # This is important for cross-compiling.
-  echo "set( CMAKE_SYSTEM_NAME" `echo ${SDK_OS} | sed 's/^./\u&/'` ")" > ${WORKDIR}/toolchain.cmake
-  echo "set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} )" >> ${WORKDIR}/toolchain.cmake
-  echo "set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} )" >> ${WORKDIR}/toolchain.cmake
-  echo "set( CMAKE_C_FLAGS \"${OECMAKE_C_FLAGS}\" CACHE STRING \"OpenEmbedded CFLAGS\" )" >> ${WORKDIR}/toolchain.cmake
-  echo "set( CMAKE_CXX_FLAGS \"${OECMAKE_CXX_FLAGS}\" CACHE STRING \"OpenEmbedded CXXFLAGS\" )" >> ${WORKDIR}/toolchain.cmake
-  echo "set( CMAKE_C_FLAGS_RELEASE \"${OECMAKE_C_FLAGS_RELEASE}\" CACHE STRING \"CFLAGS for release\" )" >> ${WORKDIR}/toolchain.cmake
-  echo "set( CMAKE_CXX_FLAGS_RELEASE \"${OECMAKE_CXX_FLAGS_RELEASE}\" CACHE STRING \"CXXFLAGS for release\" )" >> ${WORKDIR}/toolchain.cmake
-
-# only search in the paths provided (from openembedded) so cmake doesnt pick
+set( CMAKE_SYSTEM_NAME `echo ${SDK_OS} | sed 's/^./\u&/'` )
+set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} )
+set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} )
+set( CMAKE_C_FLAGS "${OECMAKE_C_FLAGS}" CACHE STRING "poky CFLAGS" )
+set( CMAKE_CXX_FLAGS "${OECMAKE_CXX_FLAGS}" CACHE STRING "poky CXXFLAGS" )
+set( CMAKE_C_FLAGS_RELEASE "${OECMAKE_C_FLAGS_RELEASE}" CACHE STRING "CFLAGS for release" )
+set( CMAKE_CXX_FLAGS_RELEASE "${OECMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "CXXFLAGS for release" )
+
+# only search in the paths provided so cmake doesnt pick
 # up libraries and tools from the native build machine
-  echo "set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} )" >> ${WORKDIR}/toolchain.cmake
-  echo "set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )" >> ${WORKDIR}/toolchain.cmake
-  echo "set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )" >> ${WORKDIR}/toolchain.cmake
-  echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )" >> ${WORKDIR}/toolchain.cmake
+set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} )
+set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
+set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
+set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
+
 # Use native cmake modules
-  echo "set( CMAKE_MODULE_PATH ${STAGING_DATADIR}/cmake/Modules/ )" >> ${WORKDIR}/toolchain.cmake
+set( CMAKE_MODULE_PATH ${STAGING_DATADIR}/cmake/Modules/ )
+EOF
 }
 
 addtask generate_toolchain_file after do_patch before do_configure
 
 cmake_do_configure() {
-  if [ ${OECMAKE_BUILDPATH} ]
-  then
-    mkdir -p ${OECMAKE_BUILDPATH}
-    cd ${OECMAKE_BUILDPATH}
-  fi
-
-  # Just like autotools cmake can use a site file to cache result that need generated binaries to run
-  if [ -e ${WORKDIR}/site-file.cmake ] ; then
-    OECMAKE_SITEFILE=" -C ${WORKDIR}/site-file.cmake"
-  else 
-    OECMAKE_SITEFILE=""
-  fi
-
-  cmake \
-    ${OECMAKE_SITEFILE} \
-    ${OECMAKE_SOURCEPATH} \
-    -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-    -DCMAKE_INSTALL_SO_NO_EXE=0 \
-        -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
-        -DCMAKE_VERBOSE_MAKEFILE=1 \
-    ${EXTRA_OECMAKE} \
-    -Wno-dev
+        if [ ${OECMAKE_BUILDPATH} ]
+        then
+                mkdir -p ${OECMAKE_BUILDPATH}
+                cd ${OECMAKE_BUILDPATH}
+        fi
+
+        # Just like autotools cmake can use a site file to cache result that need generated binaries to run
+        if [ -e ${WORKDIR}/site-file.cmake ] ; then
+                OECMAKE_SITEFILE=" -C ${WORKDIR}/site-file.cmake"
+        else
+                OECMAKE_SITEFILE=""
+        fi
+
+        cmake \
+          ${OECMAKE_SITEFILE} \
+          ${OECMAKE_SOURCEPATH} \
+          -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+          -DCMAKE_INSTALL_SO_NO_EXE=0 \
+          -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
+          -DCMAKE_VERBOSE_MAKEFILE=1 \
+          ${EXTRA_OECMAKE} \
+          -Wno-dev
 }
 
 cmake_do_compile()  {
-  if [ ${OECMAKE_BUILDPATH} ]
-  then
-     cd ${OECMAKE_BUILDPATH}
-  fi
-  
-  base_do_compile
+        if [ ${OECMAKE_BUILDPATH} ]
+        then
+                cd ${OECMAKE_BUILDPATH}
+        fi
+
+        base_do_compile
 }
 
 cmake_do_install() {
-  if [ ${OECMAKE_BUILDPATH} ];
-  then
-     cd ${OECMAKE_BUILDPATH}
-  fi
-  
-  autotools_do_install
+        if [ ${OECMAKE_BUILDPATH} ];
+        then
+                cd ${OECMAKE_BUILDPATH}
+        fi
+
+        autotools_do_install
 }
 
 EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file