mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

cmake.bbclass: sync from openembedded

Browse Source 
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>
This commit is contained in:
Qing He
2010-08-20 10:57:48 +08:00
committed by Richard Purdie
parent a0b72c2971
commit be291999de
1 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/cmake.bbclass
+48 -45
View File
@@ -25,69 +25,72 @@ OECMAKE_C_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} -DNDEBUG"
OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} -DNDEBUG" OECMAKE_CXX_FLAGS_RELEASE ?= "${SELECTED_OPTIMIZATION} -DNDEBUG"
cmake_do_generate_toolchain_file() { cmake_do_generate_toolchain_file() {
cat > ${WORKDIR}/toolchain.cmake <<EOF
# CMake system name must be something like "Linux". # CMake system name must be something like "Linux".
# This is important for cross-compiling. # This is important for cross-compiling.
echo "set( CMAKE_SYSTEM_NAME" `echo ${SDK_OS} | sed 's/^./\u&/'` ")" > ${WORKDIR}/toolchain.cmake set( CMAKE_SYSTEM_NAME `echo ${SDK_OS} | sed 's/^./\u&/'` )
echo "set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} )" >> ${WORKDIR}/toolchain.cmake set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} )
echo "set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} )" >> ${WORKDIR}/toolchain.cmake set( CMAKE_CXX_COMPILER ${OECMAKE_CXX_COMPILER} )
echo "set( CMAKE_C_FLAGS \"${OECMAKE_C_FLAGS}\" CACHE STRING \"OpenEmbedded CFLAGS\" )" >> ${WORKDIR}/toolchain.cmake set( CMAKE_C_FLAGS "${OECMAKE_C_FLAGS}" CACHE STRING "poky CFLAGS" )
echo "set( CMAKE_CXX_FLAGS \"${OECMAKE_CXX_FLAGS}\" CACHE STRING \"OpenEmbedded CXXFLAGS\" )" >> ${WORKDIR}/toolchain.cmake set( CMAKE_CXX_FLAGS "${OECMAKE_CXX_FLAGS}" CACHE STRING "poky CXXFLAGS" )
echo "set( CMAKE_C_FLAGS_RELEASE \"${OECMAKE_C_FLAGS_RELEASE}\" CACHE STRING \"CFLAGS for release\" )" >> ${WORKDIR}/toolchain.cmake set( CMAKE_C_FLAGS_RELEASE "${OECMAKE_C_FLAGS_RELEASE}" CACHE STRING "CFLAGS for release" )
echo "set( CMAKE_CXX_FLAGS_RELEASE \"${OECMAKE_CXX_FLAGS_RELEASE}\" CACHE STRING \"CXXFLAGS for release\" )" >> ${WORKDIR}/toolchain.cmake set( CMAKE_CXX_FLAGS_RELEASE "${OECMAKE_CXX_FLAGS_RELEASE}" CACHE STRING "CXXFLAGS for release" )
# only search in the paths provided (from openembedded) so cmake doesnt pick # only search in the paths provided so cmake doesnt pick
# up libraries and tools from the native build machine # 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 set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${CROSS_DIR} )
echo "set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )" >> ${WORKDIR}/toolchain.cmake set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )
echo "set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )" >> ${WORKDIR}/toolchain.cmake set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )
echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )" >> ${WORKDIR}/toolchain.cmake set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )
# Use native cmake modules # 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 addtask generate_toolchain_file after do_patch before do_configure
cmake_do_configure() { cmake_do_configure() {
if [ ${OECMAKE_BUILDPATH} ] if [ ${OECMAKE_BUILDPATH} ]
then then
mkdir -p ${OECMAKE_BUILDPATH} mkdir -p ${OECMAKE_BUILDPATH}
cd ${OECMAKE_BUILDPATH} cd ${OECMAKE_BUILDPATH}
fi fi
# Just like autotools cmake can use a site file to cache result that need generated binaries to run # 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 if [ -e ${WORKDIR}/site-file.cmake ] ; then
OECMAKE_SITEFILE=" -C ${WORKDIR}/site-file.cmake" OECMAKE_SITEFILE=" -C ${WORKDIR}/site-file.cmake"
else else
OECMAKE_SITEFILE="" OECMAKE_SITEFILE=""
fi fi
cmake \ cmake \
${OECMAKE_SITEFILE} \ ${OECMAKE_SITEFILE} \
${OECMAKE_SOURCEPATH} \ ${OECMAKE_SOURCEPATH} \
-DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-DCMAKE_INSTALL_SO_NO_EXE=0 \ -DCMAKE_INSTALL_SO_NO_EXE=0 \
-DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
-DCMAKE_VERBOSE_MAKEFILE=1 \ -DCMAKE_VERBOSE_MAKEFILE=1 \
${EXTRA_OECMAKE} \ ${EXTRA_OECMAKE} \
-Wno-dev -Wno-dev
} }
cmake_do_compile() { cmake_do_compile() {
if [ ${OECMAKE_BUILDPATH} ] if [ ${OECMAKE_BUILDPATH} ]
then then
cd ${OECMAKE_BUILDPATH} cd ${OECMAKE_BUILDPATH}
fi fi
base_do_compile base_do_compile
} }
cmake_do_install() { cmake_do_install() {
if [ ${OECMAKE_BUILDPATH} ]; if [ ${OECMAKE_BUILDPATH} ];
then then
cd ${OECMAKE_BUILDPATH} cd ${OECMAKE_BUILDPATH}
fi fi
autotools_do_install autotools_do_install
} }
EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file EXPORT_FUNCTIONS do_configure do_compile do_install do_generate_toolchain_file