Author: rthomsen
Date: 2012-04-09 06:50:25 -0600 (Mon, 09 Apr 2012)
New Revision: 9884

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/prog/cmake.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
CMake 2.8.7.

Modified: trunk/BOOK/general/prog/cmake.xml
===================================================================
--- trunk/BOOK/general/prog/cmake.xml   2012-04-09 11:35:34 UTC (rev 9883)
+++ trunk/BOOK/general/prog/cmake.xml   2012-04-09 12:50:25 UTC (rev 9884)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY cmake-download-http 
"http://www.cmake.org/files/v2.8/cmake-&cmake-version;.tar.gz";>
+  <!ENTITY cmake-download-http 
"http://www.cmake.org/files/v&cmake-major-version;/cmake-&cmake-version;.tar.gz";>
   <!ENTITY cmake-download-ftp  " ">
-  <!ENTITY cmake-md5sum        "2147da452fd9212bb9b4542a9eee9d5b">
-  <!ENTITY cmake-size          "5.3 MB">
-  <!ENTITY cmake-buildsize     "303 MB (including tests)">
-  <!ENTITY cmake-time          "4.1 SBU (including 2.5 SBU test time)">
+  <!ENTITY cmake-md5sum        "e1b237aeaed880f65dec9c20602452f6">
+  <!ENTITY cmake-size          "5.4 MB">
+  <!ENTITY cmake-buildsize     "220 MB (including tests)">
+  <!ENTITY cmake-time          "1.8 SBU (additional 6.5 SBU for the test 
suite)">
 ]>
 
 <sect1 id="cmake" xreflabel="cmake-&cmake-version;">
@@ -33,7 +33,7 @@
     for generating <filename>Makefile</filename>s. It is a successor of the 
auto-generated
     <command>configure</command> script.</para>
 
-    &lfs70_checked;
+    &lfs71_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -66,9 +66,10 @@
       <xref linkend="expat"/>
     </para>
 
-    <bridgehead renderas="sect4">Options</bridgehead>
+    <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="subversion"/> (for testing)
+      <xref linkend="subversion"/> (for testing) and
+      <xref linkend="qt4"/> (for the Qt-based GUI)
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -104,6 +105,9 @@
     to link against <application>Zlib</application>, 
<application>Bzip2</application>, 
     <application>cURL</application> and <application>Expat</application> 
installed 
     on the system.</para>
+    
+    <para><option>--qt-gui</option>: This option builds a 
<application>Qt</application>-based 
+    GUI for <application>CMake</application>.</para>
 
   </sect2>
 
@@ -116,38 +120,19 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>ctest, cpack, ccmake, and cmake</seg>
+        <seg>ccmake, cmake, cmake-gui, cpack and ctest</seg>
         <seg>None</seg>
-        <seg>/usr/share/cmake-&cmake-version; and
+        <seg>/usr/share/cmake-&cmake-major-version; and
         /usr/share/doc/cmake-&cmake-version;</seg>
       </seglistitem>
     </segmentedlist>
 
+    
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="ctest">
-        <term><command>ctest</command></term>
-        <listitem>
-          <para>is a testing utility for cmake-generated build trees.</para>
-          <indexterm zone="cmake ctest">
-            <primary sortas="b-ctest">ctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpack">
-        <term><command>cpack</command></term>
-        <listitem>
-          <para>is the CMake packaging program.</para>
-          <indexterm zone="cmake cpack">
-            <primary sortas="b-cpack">cpack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="ccmake">
         <term><command>ccmake</command></term>
         <listitem>
@@ -167,7 +152,37 @@
           </indexterm>
         </listitem>
       </varlistentry>
+      
+      <varlistentry id="cmake-gui">
+        <term><command>cmake-gui</command></term>
+        <listitem>
+          <para>is the Qt-based frontent to CMake.</para>
+          <indexterm zone="cmake cmake-gui">
+            <primary sortas="b-cmake-gui">cmake-gui</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
+      <varlistentry id="cpack">
+        <term><command>cpack</command></term>
+        <listitem>
+          <para>is the CMake packaging program.</para>
+          <indexterm zone="cmake cpack">
+            <primary sortas="b-cpack">cpack</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>      
+      
+      <varlistentry id="ctest">
+        <term><command>ctest</command></term>
+        <listitem>
+          <para>is a testing utility for cmake-generated build trees.</para>
+          <indexterm zone="cmake ctest">
+            <primary sortas="b-ctest">ctest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2012-04-09 11:35:34 UTC (rev 9883)
+++ trunk/BOOK/general.ent      2012-04-09 12:50:25 UTC (rev 9884)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "08">                   <!-- Always 2 digits -->
+<!ENTITY day          "09">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 8th, &year;">
+<!ENTITY releasedate  "April 9th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -354,7 +354,8 @@
 
 <!-- Chapter 12 -->
 <!ENTITY check-version                "0.9.8">
-<!ENTITY cmake-version                "2.8.6">
+<!ENTITY cmake-major-version          "2.8">
+<!ENTITY cmake-version                "2.8.7">
 <!ENTITY cvs-version                  "1.11.23">
 <!ENTITY dejagnu-version              "1.5">
 <!ENTITY doxygen-version              "1.7.5">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2012-04-09 11:35:34 UTC 
(rev 9883)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2012-04-09 12:50:25 UTC 
(rev 9884)
@@ -42,6 +42,16 @@
 
 -->
     <listitem>
+      <para>April 9th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[rthomsen] - Upgrade to CMake 2.8.7. Fixes 
+         <ulink url="&blfs-ticket-root;3322">#3322</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 8th, 2012</para>
       <itemizedlist>
         <listitem>

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to