Magellan Linux

Diff of /trunk/include/cmake.sminc

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 29802 by niro, Thu Oct 12 13:32:14 2017 UTC revision 29886 by niro, Tue Oct 17 08:53:12 2017 UTC
# Line 134  cmake_configure() Line 134  cmake_configure()
134   default_opts+=" -DCMAKE_BUILD_TYPE=Release"   default_opts+=" -DCMAKE_BUILD_TYPE=Release"
135   default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"   default_opts+=" -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr}"
136   default_opts+=" -DLIB_SUFFIX=${libsuffix}"   default_opts+=" -DLIB_SUFFIX=${libsuffix}"
137   default_opts+=" -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)"   default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'
138    
139   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
140   then   then
# Line 145  cmake_configure() Line 145  cmake_configure()
145   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
146   for abi in ${abis_to_run}   for abi in ${abis_to_run}
147   do   do
148   cd ${BUILDDIR}/build-$(mabi)   cd ${BUILDDIR}/build-${abi}
149   cmake ${default_opts} ${configure_opts} ${SRCDIR}-$(mabi)/${SRCSUBDIR} || die   cmake ${default_opts} ${configure_opts} ${SRCDIR}-${abi}/${SRCSUBDIR} || die
150   done   done
151   else   else
152   cd ${BUILDDIR}/build   cd ${BUILDDIR}/build

Legend:
Removed from v.29802  
changed lines
  Added in v.29886