Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/include/cmake.sminc

    Diff of /smage/trunk/include/cmake.sminc

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

    revision 13779 by niro, Thu Dec 21 09:38:04 2017 UTC revision 13780 by niro, Wed Oct 30 12:52:26 2019 UTC
    # Line 131  cmake_configure() Line 131  cmake_configure()
    131  {  {
    132   local configure_opts="$@"   local configure_opts="$@"
    133   local default_opts   local default_opts
    134     [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
    135     [[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
    136    
    137   # disable colors if requested   # disable colors if requested
    138   if [[ ${NOCOLORS} = true ]]   if [[ ${NOCOLORS} = true ]]
    # Line 163  cmake_configure() Line 165  cmake_configure()
    165   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    166   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    167   do   do
    168   cd ${BUILDDIR}/build-${abi}   : ${CMAKE_SRCDIR="${SRCDIR}-${abi}/${SRCSUBDIR}"}
    169   abi-${abi} cmake ${default_opts} ${configure_opts} ${SRCDIR}-${abi}/${SRCSUBDIR} || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}
    170     cd ${CMAKE_BUILDDIR}
    171     abi-${abi} cmake ${default_opts} ${configure_opts} ${CMAKE_SRCDIR} || die
    172   done   done
    173   else   else
    174     : ${CMAKE_SRCDIR="${SRCDIR}/${SRCSUBDIR}"}
    175     : ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
    176   cd ${BUILDDIR}/build   cd ${BUILDDIR}/build
    177   cmake ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} || die   cmake ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} || die
    178   fi   fi
    # Line 174  cmake_configure() Line 180  cmake_configure()
    180    
    181  cmake_setup_builddir()  cmake_setup_builddir()
    182  {  {
    183     [[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
    184    
    185   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    186   then   then
    187   all-abis install -d ${BUILDDIR}/build-$(mabi) || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
    188     all-abis install -d ${CMAKE_BUILDDIR} || die
    189   else   else
    190   install -d ${BUILDDIR}/build || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
    191     install -d ${CMAKE_BUILDDIR} || die
    192   fi   fi
    193  }  }
    194    
    195  cmake_mmake()  cmake_mmake()
    196  {  {
    197     [[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
    198    
    199   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    200   then   then
    201   mmake -C ${BUILDDIR}/build-$(mabi) "$@" || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
    202     mmake -C ${CMAKE_BUILDDIR} "$@" || die
    203   else   else
    204   mmake -C ${BUILDDIR}/build "$@" || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
    205     mmake -C ${CMAKE_BUILDDIR} "$@" || die
    206   fi   fi
    207  }  }
    208    
    209  cmake_src_compile()  cmake_src_compile()
    210  {  {
    211   cd ${SRCDIR}   [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
    212    
    213     : ${CMAKE_SRCDIR="${SRCDIR}"}
    214     cd ${CMAKE_SRCDIR}
    215    
    216   cmake_setup_builddir || die   cmake_setup_builddir || die
    217   cmake_configure "$@" || die   cmake_configure "$@" || die
    # Line 203  cmake_src_compile() Line 220  cmake_src_compile()
    220    
    221  cmake_src_check()  cmake_src_check()
    222  {  {
    223   #cd ${BUILDDIR}/build   #[[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
    224     #
    225     #: ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
    226     #cd ${CMAKE_BUILDDIR}
    227   #mmake -j1 -k check || die   #mmake -j1 -k check || die
    228   return 0   return 0
    229  }  }
    230    
    231  cmake_multilib_src_check()  cmake_multilib_src_check()
    232  {  {
    233     #[[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
    234     #
    235   #local abi   #local abi
    236   #local abis_to_run="${MULTILIB_ABIS}"   #local abis_to_run="${MULTILIB_ABIS}"
    237   #   #
    # Line 217  cmake_multilib_src_check() Line 239  cmake_multilib_src_check()
    239   #[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   #[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    240   #for abi in ${abis_to_run}   #for abi in ${abis_to_run}
    241   #do   #do
    242   # cd ${BUILDDIR}/build-${abi}   # : ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}
    243     # cd ${CMAKE_BUILDDIR}
    244   # mmake -j1 -k check || die   # mmake -j1 -k check || die
    245   #done   #done
    246   return 0   return 0
    # Line 225  cmake_multilib_src_check() Line 248  cmake_multilib_src_check()
    248    
    249  cmake_src_install()  cmake_src_install()
    250  {  {
    251     [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
    252    
    253     : ${CMAKE_SRCDIR="${SRCDIR}"}
    254    
    255   cmake_mmake DESTDIR=${BINDIR} install || die   cmake_mmake DESTDIR=${BINDIR} install || die
    256    
    257   cd ${SRCDIR}   cd ${CMAKE_SRCDIR}
    258   local i   local i
    259   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    260   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
    261   do   do
    262   if [ -f ${SRCDIR}/${i} ]   if [ -f ${CMAKE_SRCDIR}/${i} ]
    263   then   then
    264   minstalldocs ${i} || die   minstalldocs ${i} || die
    265   fi   fi
    # Line 243  cmake_multilib_src_install() Line 270  cmake_multilib_src_install()
    270  {  {
    271   local abi   local abi
    272   local abis_to_run="${MULTILIB_ABIS}"   local abis_to_run="${MULTILIB_ABIS}"
    273     [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
    274    
    275   cmake_mmake DESTDIR=${BINDIR} install || die   cmake_mmake DESTDIR=${BINDIR} install || die
    276    
    # Line 250  cmake_multilib_src_install() Line 278  cmake_multilib_src_install()
    278   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    279   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    280   do   do
    281   cd ${SRCDIR}-${abi}   : ${CMAKE_SRCDIR="${SRCDIR}-${abi}"}
    282    
    283     cd ${CMAKE_SRCDIR}
    284   local i   local i
    285   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    286   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
    287   do   do
    288   if [ -f ${SRCDIR}-${abi}/${i} ]   if [ -f ${CMAKE_SRCDIR}/${i} ]
    289   then   then
    290   minstalldocs ${i} || die   minstalldocs ${i} || die
    291   fi   fi
    Legend:
    Removed from v.13779  
    changed lines
      Added in v.13780