Ignore:
Timestamp:
09/28/2022 10:34:01 AM (19 months ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal
Children:
3d48ae4
Parents:
5fe69261 (diff), 87065037 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into plabs/python-mods

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/prog/cmake.xml

    r5fe69261 r1ff0f0c  
    77  <!ENTITY cmake-download-http "https://cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz">
    88  <!ENTITY cmake-download-ftp  " ">
    9   <!ENTITY cmake-md5sum        "3360abcd5576dc028204cd4583e6d4e9">
     9  <!ENTITY cmake-md5sum        "84d08f30b110401d8178f0708c19f1fe">
    1010  <!ENTITY cmake-size          "9.9 MB">
    11   <!ENTITY cmake-buildsize     "417 MB (add 1.1 GB for tests)">
    12   <!ENTITY cmake-time          "2.3 SBU (add 3.9 SBU for tests, both using parallelism=4)">
     11  <!ENTITY cmake-buildsize     "443 MB (add 1.1 GB for tests)">
     12  <!ENTITY cmake-time          "3.0 SBU (add 4.0 SBU for tests, both using parallelism=4)">
    1313]>
    1414
     
    7474    </itemizedlist>
    7575
     76<!--
    7677    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    7778    <itemizedlist spacing="compact">
     
    8384      </listitem>
    8485    </itemizedlist>
    85 
     86-->
    8687
    8788    <bridgehead renderas="sect3">CMake Dependencies</bridgehead>
     
    118119    <title>Installation of CMake</title>
    119120
     121 <!--
    120122    <para>
    121123      First, adapt the FindBoost module to use Boost-1.80.0:
     
    123125
    124126<screen><userinput remap="pre">patch -Np1 -i ../cmake-&cmake-version;-upstream_fix-1.patch</userinput></screen>
     127-->
    125128
    126129    <para>
Note: See TracChangeset for help on using the changeset viewer.