Changeset 9ea9aa7 for general/genlib/qca.xml

Timestamp:

04/06/2016 11:23:04 PM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

systemd-13485

Children:

c7facee

Parents:

02d46cb

Message:

Merges from trunk to r17100.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17231 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/genlib/qca.xml (modified) (2 diffs)

general/genlib/qca.xml

@@ -95 +95 @@
 <screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen>
 
+    <para>This package can be built against <xref linkend="qt4"/> or
+    <xref linkend="qt5"/>. If using qt4, run:</para>
+
+<screen><userinput>QT_DIR=&qt4-dir; &amp;&amp;
+QT4_BUILD=ON</userinput></screen>
+
+    <para>If using qt5, run:</para>
+
+<screen><userinput>QT_DIR=&qt5-dir; &amp;&amp;
+QT4_BUILD=OFF</userinput></screen>
+
     <para>Install <application>Qca</application> by running the following
     commands:</para>
@@ -101 +112 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir;            \
+cmake -DCMAKE_INSTALL_PREFIX=$QT_DIR            \
       -DCMAKE_BUILD_TYPE=Release                \
-      -DQT4_BUILD=ON                            \
+      -DQT4_BUILD=$QT4_BUILD                    \
       -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
       ..                                        &amp;&amp;
+unset QT_DIR QT4_BUILD                          &amp;&amp;
 
 make</userinput></screen>