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 33627 by niro, Wed Aug 19 12:47:32 2020 UTC revision 33628 by niro, Thu Aug 10 15:10:19 2023 UTC
    # Line 146  cmake_configure() Line 146  cmake_configure()
    146   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    147   then   then
    148   # eval these variables later with the abi-${ABI} caller   # eval these variables later with the abi-${ABI} caller
    149   default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'  # default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'
    150   default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'  # default_opts+=' -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)'
    151   default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'  # default_opts+=' -DLIB_SUFFIX=$(cmake_libsuffix)'
    152     default_opts+=' -DCMAKE_INSTALL_LIBDIR=${PREFIX:-/usr}/$(mlibdir)'
    153   else   else
    154   # eval these variables now   # eval these variables now
    155   default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)"  # default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)"
    156   default_opts+=" -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)"  # default_opts+=" -DLIB_INSTALL_DIR=${PREFIX:-/usr}/$(mlibdir)"
    157   default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)"  # default_opts+=" -DLIB_SUFFIX=$(cmake_libsuffix)"
    158     default_opts+=" -DCMAKE_INSTALL_LIBDIR=${PREFIX:-/usr}/$(mlibdir)"
    159   fi   fi
    160    
    161   if [[ ${MULTILIB_BUILD} = true ]]   if [[ ${MULTILIB_BUILD} = true ]]
    # Line 165  cmake_configure() Line 167  cmake_configure()
    167   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"   [[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
    168   for abi in ${abis_to_run}   for abi in ${abis_to_run}
    169   do   do
    170   : ${CMAKE_SRCDIR="${SRCDIR}-${abi}/${SRCSUBDIR}"}   #: ${CMAKE_SRCDIR="${SRCDIR}-${abi}/${SRCSUBDIR}"}
    171   : ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}   #: ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}
    172     CMAKE_SRCDIR="${SRCDIR}-${abi}/${SRCSUBDIR}"
    173     CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"
    174   cd ${CMAKE_BUILDDIR}   cd ${CMAKE_BUILDDIR}
    175   abi-${abi} cmake ${default_opts} ${configure_opts} ${CMAKE_SRCDIR} || die   abi-${abi} cmake ${default_opts} ${configure_opts} ${CMAKE_SRCDIR} || die
    176   done   done
    Legend:
    Removed from v.33627  
    changed lines
      Added in v.33628