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 33260 by niro, Mon Oct 21 10:08:11 2019 UTC revision 33261 by niro, Tue Oct 22 12:29:35 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 178  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   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
    # Line 190  cmake_setup_builddir() Line 194  cmake_setup_builddir()
    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   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
    # Line 202  cmake_mmake() Line 208  cmake_mmake()
    208    
    209  cmake_src_compile()  cmake_src_compile()
    210  {  {
    211     [[ -n ${CMAKE_SRCDIR} ]] || local CMAKE_SRCDIR
    212    
    213   : ${CMAKE_SRCDIR="${SRCDIR}"}   : ${CMAKE_SRCDIR="${SRCDIR}"}
    214   cd ${CMAKE_SRCDIR}   cd ${CMAKE_SRCDIR}
    215    
    # Line 212  cmake_src_compile() Line 220  cmake_src_compile()
    220    
    221  cmake_src_check()  cmake_src_check()
    222  {  {
    223     #[[ -n ${CMAKE_BUILDDIR} ]] || local CMAKE_BUILDDIR
    224     #
    225   #: ${CMAKE_BUILDDIR="${BUILDDIR}/build"}   #: ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
    226   #cd ${CMAKE_BUILDDIR}   #cd ${CMAKE_BUILDDIR}
    227   #mmake -j1 -k check || die   #mmake -j1 -k check || die
    # Line 220  cmake_src_check() Line 230  cmake_src_check()
    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 236  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}"}   : ${CMAKE_SRCDIR="${SRCDIR}"}
    254    
    255   cmake_mmake DESTDIR=${BINDIR} install || die   cmake_mmake DESTDIR=${BINDIR} install || die
    # Line 256  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    
    Legend:
    Removed from v.33260  
    changed lines
      Added in v.33261