Magellan Linux

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

    Diff of /trunk/include/cmake.sminc

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

    revision 33241 by niro, Fri Oct 27 08:58:33 2017 UTC revision 33242 by niro, Mon Oct 21 10:08:11 2019 UTC
    # Line 163  cmake_configure() Line 163  cmake_configure()
    163   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    164   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    165   do   do
    166   cd ${BUILDDIR}/build-${abi}   : ${CMAKE_SRCDIR="${SRCDIR}-${abi}/${SRCSUBDIR}"}
    167   abi-${abi} cmake ${default_opts} ${configure_opts} ${SRCDIR}-${abi}/${SRCSUBDIR} || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}
    168     cd ${CMAKE_BUILDDIR}
    169     abi-${abi} cmake ${default_opts} ${configure_opts} ${CMAKE_SRCDIR} || die
    170   done   done
    171   else   else
    172     : ${CMAKE_SRCDIR="${SRCDIR}/${SRCSUBDIR}"}
    173     : ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
    174   cd ${BUILDDIR}/build   cd ${BUILDDIR}/build
    175   cmake ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} || die   cmake ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} || die
    176   fi   fi
    # Line 176  cmake_setup_builddir() Line 180  cmake_setup_builddir()
    180  {  {
    181   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    182   then   then
    183   all-abis install -d ${BUILDDIR}/build-$(mabi) || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
    184     all-abis install -d ${CMAKE_BUILDDIR} || die
    185   else   else
    186   install -d ${BUILDDIR}/build || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
    187     install -d ${CMAKE_BUILDDIR} || die
    188   fi   fi
    189  }  }
    190    
    # Line 186  cmake_mmake() Line 192  cmake_mmake()
    192  {  {
    193   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    194   then   then
    195   mmake -C ${BUILDDIR}/build-$(mabi) "$@" || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
    196     mmake -C ${CMAKE_BUILDDIR} "$@" || die
    197   else   else
    198   mmake -C ${BUILDDIR}/build "$@" || die   : ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
    199     mmake -C ${CMAKE_BUILDDIR} "$@" || die
    200   fi   fi
    201  }  }
    202    
    203  cmake_src_compile()  cmake_src_compile()
    204  {  {
    205   cd ${SRCDIR}   : ${CMAKE_SRCDIR="${SRCDIR}"}
    206     cd ${CMAKE_SRCDIR}
    207    
    208   cmake_setup_builddir || die   cmake_setup_builddir || die
    209   cmake_configure "$@" || die   cmake_configure "$@" || die
    # Line 203  cmake_src_compile() Line 212  cmake_src_compile()
    212    
    213  cmake_src_check()  cmake_src_check()
    214  {  {
    215   #cd ${BUILDDIR}/build   #: ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
    216     #cd ${CMAKE_BUILDDIR}
    217   #mmake -j1 -k check || die   #mmake -j1 -k check || die
    218   return 0   return 0
    219  }  }
    # Line 217  cmake_multilib_src_check() Line 227  cmake_multilib_src_check()
    227   #[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   #[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    228   #for abi in ${abis_to_run}   #for abi in ${abis_to_run}
    229   #do   #do
    230   # cd ${BUILDDIR}/build-${abi}   # : ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}
    231     # cd ${CMAKE_BUILDDIR}
    232   # mmake -j1 -k check || die   # mmake -j1 -k check || die
    233   #done   #done
    234   return 0   return 0
    # Line 225  cmake_multilib_src_check() Line 236  cmake_multilib_src_check()
    236    
    237  cmake_src_install()  cmake_src_install()
    238  {  {
    239     : ${CMAKE_SRCDIR="${SRCDIR}"}
    240    
    241   cmake_mmake DESTDIR=${BINDIR} install || die   cmake_mmake DESTDIR=${BINDIR} install || die
    242    
    243   cd ${SRCDIR}   cd ${CMAKE_SRCDIR}
    244   local i   local i
    245   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    246   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
    247   do   do
    248   if [ -f ${SRCDIR}/${i} ]   if [ -f ${CMAKE_SRCDIR}/${i} ]
    249   then   then
    250   minstalldocs ${i} || die   minstalldocs ${i} || die
    251   fi   fi
    # Line 250  cmake_multilib_src_install() Line 263  cmake_multilib_src_install()
    263   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    264   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    265   do   do
    266   cd ${SRCDIR}-${abi}   : ${CMAKE_SRCDIR="${SRCDIR}-${abi}"}
    267    
    268     cd ${CMAKE_SRCDIR}
    269   local i   local i
    270   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \   for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
    271   FAQ LICENSE NEWS README TODO   FAQ LICENSE NEWS README TODO
    272   do   do
    273   if [ -f ${SRCDIR}-${abi}/${i} ]   if [ -f ${CMAKE_SRCDIR}/${i} ]
    274   then   then
    275   minstalldocs ${i} || die   minstalldocs ${i} || die
    276   fi   fi
    Legend:
    Removed from v.33241  
    changed lines
      Added in v.33242