Commit cf313d2b authored by Alexander Stukowski's avatar Alexander Stukowski

Updated again the build instructions for the Linux package

parent b90a33d3
......@@ -52,36 +52,36 @@ build_linux_package:
- cd build
- export LD_LIBRARY_PATH=$HOME/progs/libav/lib:$LD_LIBRARY_PATH
- echo $PWD
- $HOME/progs/cmake-3.6.3-Linux-x86_64/bin/cmake \
-DOVITO_BUILD_DOCUMENTATION=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=../release_install \
-DOVITO_REDISTRIBUTABLE_PACKAGE=ON \
-DOVITO_DOUBLE_PRECISION_FP=ON \
-DBOOST_ROOT=$HOME/progs/boost \
-DHDF5_DIR=$HOME/progs/hdf5/share/cmake \
-DnetCDF_DIR=$HOME/progs/netcdf/lib/cmake/netCDF \
-DPYTHON_EXECUTABLE=$HOME/progs/python/bin/python3 \
-DPYTHON_LIBRARY=$HOME/progs/python/lib/libpython3.6m.so.1.0 \
-DPYTHON_INCLUDE_DIR=$HOME/progs/python/include/python3.6m \
-DCMAKE_PREFIX_PATH=$HOME/progs/qt5/ \
-DQSCINTILLA_INCLUDE_DIR=$HOME/progs/QScintilla_gpl-2.9.3/Qt4Qt5/ \
-DQSCINTILLA_LIBRARY=$HOME/progs/QScintilla_gpl-2.9.3/Qt4Qt5/libqscintilla2.so.12 \
-DLIBAV_INCLUDE_DIR=$HOME/progs/libav/include \
-DLIBAV_LIBRARY_DIR=$HOME/progs/libav/lib \
-DOVITO_BUILD_PLUGIN_OSPRAY=ON \
-Dospray_DIR=$HOME/progs/ospray_install/lib/cmake/ospray-1.8.4 \
-Dembree_DIR=$HOME/progs/embree_install/lib/cmake/embree-3.5.2 \
-DISPC_EXECUTABLE=$HOME/progs/ispc-v1.9.2-linux/ispc \
-DTBB_INCLUDE_DIR=$HOME/progs/tbb2018_20170919oss/include/ \
-DTBB_LIBRARY=$HOME/progs/tbb2018_20170919oss/lib/intel64/gcc4.7/libtbb.so \
-DTBB_LIBRARY_MALLOC=$HOME/progs/tbb2018_20170919oss/lib/intel64/gcc4.7/libtbbmalloc.so \
-DTBB_DIR=$HOME/progs/tbb2018_20170919oss/cmake \
-DTBB_ROOT=$HOME/progs/tbb2018_20170919oss \
-DLIBSSH_INCLUDE_DIR=$HOME/progs/libssh_install/include \
-DLIBSSH_LIBRARY=$HOME/progs/libssh_install/lib/libssh.so \
..
- cmake \
-DOVITO_BUILD_DOCUMENTATION=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=../release_install \
-DOVITO_REDISTRIBUTABLE_PACKAGE=ON \
-DOVITO_DOUBLE_PRECISION_FP=ON \
-DHDF5_DIR=$HOME/progs/hdf5/share/cmake/hdf5 \
-DnetCDF_DIR=$HOME/progs/netcdf/lib/cmake/netCDF \
-DPYTHON_EXECUTABLE=$HOME/progs/python/bin/python3 \
-DPYTHON_LIBRARY=`echo $HOME/progs/python/lib/libpython*.so.*` \
-DPYTHON_INCLUDE_DIR=`echo $HOME/progs/python/include/python*` \
-DCMAKE_PREFIX_PATH=$HOME/progs/qt5/ \
-DQSCINTILLA_INCLUDE_DIR=`echo $HOME/progs/QScintilla_gpl-*`/Qt4Qt5/ \
-DQSCINTILLA_LIBRARY=`echo $HOME/progs/QScintilla_gpl-*/Qt4Qt5/libqscintilla2_qt5.so.*` \
-DLIBAV_INCLUDE_DIR=$HOME/progs/libav/include \
-DLIBAV_LIBRARY_DIR=$HOME/progs/libav/lib \
-DOVITO_BUILD_PLUGIN_OSPRAY=ON \
-Dospray_DIR=`echo $HOME/progs/ospray_install/lib/cmake/ospray-*` \
-Dembree_DIR=`echo $HOME/progs/embree_install/lib/cmake/embree-*` \
-DISPC_EXECUTABLE=`echo $HOME/progs/ispc-*-linux/ispc` \
-DTBB_INCLUDE_DIR=`echo $HOME/progs/tbb*oss`/include/ \
-DTBB_LIBRARY=`echo $HOME/progs/tbb*oss`/lib/intel64/gcc4.7/libtbb.so \
-DTBB_LIBRARY_MALLOC=`echo $HOME/progs/tbb*oss`/lib/intel64/gcc4.7/libtbbmalloc.so \
-DTBB_DIR=`echo $HOME/progs/tbb*oss`/cmake \
-DTBB_ROOT=`echo $HOME/progs/tbb*oss` \
-DLIBSSH_INCLUDE_DIR=$HOME/progs/libssh/include \
-DLIBSSH_LIBRARY=$HOME/progs/libssh/lib/libssh.so \
..
- make
- cpack
# build_macos_release:
# stage: build
......
This diff is collapsed.
......@@ -23,118 +23,7 @@
<simplesect>
<title>Linux</title>
<para>
OVITO for Linux includes shared libraries that have been built from the unmodified sources of Qt 5.10 provided by the Qt Company.
The binaries have been generated as follows:
<programlisting>
# GCC 5.1 compiler on Ubuntu Linux 10.04:
./configure \
-opensource \
-confirm-license \
-shared \
-no-qml-debug \
-nomake examples \
-ssl \
-openssl-linked \
-qt-libpng \
-qt-libjpeg \
-qt-pcre \
-qt-xcb \
-qt-xkbcommon-x11 \
-no-cups \
-no-glib \
-no-xinput2 \
-pch \
-no-eglfs \
-no-linuxfb \
-skip qtconnectivity \
-skip qtmultimedia \
-skip qt3d \
-skip qtcanvas3d \
-skip qtcharts \
-skip qtxmlpatterns \
-skip qtlocation \
-skip qtsensors \
-skip qtdeclarative \
-skip qtdoc \
-skip qtquickcontrols \
-skip qtquickcontrols2 \
-skip qtserialport \
-skip qtgraphicaleffects \
-skip qttranslations \
-skip qtwebchannel \
-skip qtactiveqt \
-skip qtdatavis3d \
-skip qtgamepad \
-skip qtscript \
-skip qtserialbus \
-skip qtvirtualkeyboard \
-skip qtwayland \
-skip qtwebengine \
-skip qtwebsockets \
-skip qtwebview \
-skip qtwebglplugin \
-prefix $HOME/progs/qt5
make
make install
</programlisting>
</para>
</simplesect>
<simplesect>
<title>Linux</title>
<para>
OVITO for Linux comes with shared libraries, which have been built from the original sources of Qt 5.10 as follows:
<programlisting>
./configure \ # GCC 5.1 compiler on Ubuntu Linux 10.04
-opensource \
-confirm-license \
-shared \
-no-qml-debug \
-nomake examples \
-ssl \
-openssl-linked \
-qt-libpng \
-qt-libjpeg \
-qt-pcre \
-qt-xcb \
-qt-xkbcommon-x11 \
-no-cups \
-no-glib \
-no-xinput2 \
-pch \
-no-eglfs \
-no-linuxfb \
-skip qtconnectivity \
-skip qtmultimedia \
-skip qt3d \
-skip qtcanvas3d \
-skip qtcharts \
-skip qtxmlpatterns \
-skip qtlocation \
-skip qtsensors \
-skip qtdeclarative \
-skip qtdoc \
-skip qtquickcontrols \
-skip qtquickcontrols2 \
-skip qtserialport \
-skip qtgraphicaleffects \
-skip qttranslations \
-skip qtwebchannel \
-skip qtactiveqt \
-skip qtdatavis3d \
-skip qtgamepad \
-skip qtscript \
-skip qtserialbus \
-skip qtvirtualkeyboard \
-skip qtwayland \
-skip qtwebengine \
-skip qtwebsockets \
-skip qtwebview \
-skip qtwebglplugin \
-prefix $HOME/progs/qt5
make
make install
</programlisting>
OVITO for Linux includes the original and unmodified shared libraries of Qt 5.12.4 distributed by the Qt Company.
</para>
</simplesect>
......
......@@ -15,9 +15,8 @@
</imageobject></mediaobject></screenshot></informalfigure>
The <emphasis>Clone pipeline</emphasis> function lets you duplicate the currently selected <link linkend="usage.modification_pipeline">data pipeline</link>
in order to visualize multiple datasets side by side, or visualize the same dataset in multiple different ways. The function can be invoked by
selecting <menuchoice><guimenu>Edit</guimenu><guimenuitem>Clone pipeline</guimenuitem></menuchoice> from the main menu
as indicated in this screenshot.
in order to visualize multiple datasets side by side, or visualize the same dataset in several different ways. The function can be invoked by
selecting <menuchoice><guimenu>Edit</guimenu><guimenuitem>Clone pipeline</guimenuitem></menuchoice> from the main menu, which is depicted in the screenshot.
</para>
<para>
......@@ -25,8 +24,21 @@
<imagedata fileref="images/clone_pipeline/clone_pipeline_dialog.png" format="PNG" scale="85" />
</imageobject></mediaobject></screenshot></informalfigure>
The <emphasis>Clone pipeline</emphasis> dialog appears to let you configure the cloning operation first. Pressing the <guibutton>Ok</guibutton>
actually clones the current pipeline and closes the dialog.
The <emphasis>Clone pipeline</emphasis> dialog is shown to let you configure the cloning operation.
Once you close the dialog with the <guibutton>Ok</guibutton> button, the cloning operation is executed according
to the settings you made (see below).
</para>
<para>
After the pipeline has been cloned, both the new and the old data pipeline will be part of the
current visualization scene and you will see two objects in the viewports. One of the pipelines is
the <emphasis>currently selected pipeline</emphasis>, whose modifiers are shown in the
<link linkend="usage.modification_pipeline.pipeline_listbox">pipeline editor</link>.
The drop-down listbox at the top of the command panel's
modification page indicates which pipeline is the selected one and allows you to switch
between all pipelines of the current scene. You can also click on an object in the interactive viewports
in order select the data pipeline that is associated with that object. The currently
selected object is typically indicated by a white simulation box color.
</para>
<para>
......
......@@ -334,7 +334,7 @@ void PipelineSceneNode::loadFromStream(ObjectLoadStream& stream)
******************************************************************************/
QString PipelineSceneNode::objectTitle() const
{
// If a name has been assigned to this node, return it as the node's display title.
// If a user-defined name has been assigned to this node, return it as the node's display title.
if(!nodeName().isEmpty())
return nodeName();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment