From fd2efe5428b3b2b9d300b0612c0a53ee2486ba64 Mon Sep 17 00:00:00 2001 From: kgv Date: Thu, 22 Apr 2021 20:57:38 +0300 Subject: [PATCH] 0032320: Documentation - mention rapidjson-dev and qtcreator within Debian packages --- adm/qmake/Occt.pro | 4 ++ adm/qmake/qtcreator-occt-cpp.xml | 39 +++++++++++++++++++ dox/build/build_3rdparty/building_3rdparty.md | 25 ++++++------ 3 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 adm/qmake/qtcreator-occt-cpp.xml diff --git a/adm/qmake/Occt.pro b/adm/qmake/Occt.pro index 3a4698ca3a..90b83a89a3 100644 --- a/adm/qmake/Occt.pro +++ b/adm/qmake/Occt.pro @@ -9,6 +9,10 @@ # - Open project in Qt Creator, and call "Run qmake". # - Close the project in Qt Creator, open it again so that you should see the sub-modules in Project tree; call "Run qmake" again. # - "Run qmake" and perform Build. +# +# Within Debian-based Linux repository Qt Creator can be installed like this: +# > sudo apt-get install qtcreator qtbase5-dev + TEMPLATE = subdirs exists(custom.auto.pri) { include(custom.auto.pri) } exists(custom.pri) { include(custom.pri) } diff --git a/adm/qmake/qtcreator-occt-cpp.xml b/adm/qmake/qtcreator-occt-cpp.xml new file mode 100644 index 0000000000..133ca00197 --- /dev/null +++ b/adm/qmake/qtcreator-occt-cpp.xml @@ -0,0 +1,39 @@ + + + + + + CodeStyleData + + true + false + false + true + false + true + true + false + true + false + true + false + true + true + false + true + false + true + false + 2 + true + true + 2 + true + 2 + + + + DisplayName + occt + + diff --git a/dox/build/build_3rdparty/building_3rdparty.md b/dox/build/build_3rdparty/building_3rdparty.md index 889969def1..8203062365 100644 --- a/dox/build/build_3rdparty/building_3rdparty.md +++ b/dox/build/build_3rdparty/building_3rdparty.md @@ -265,6 +265,18 @@ There are two types of third-party products, which are necessary to build OCCT: * FreeImage 3.14.1 - 3.16.0; * VTK 6.1.0. +@subsection dev_guides__building_3rdparty_linux_4 Installation From Official Repositories + +**Debian-based distributives** + +All 3rd-party products required for building of OCCT could be installed +from official repositories. You may install them from console using apt-get utility: + + sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libfreeimage-dev rapidjson-dev + +Building is possible with C++ compliant compiler: + + sudo apt-get install g++ @subsection dev_guides__building_3rdparty_linux_2_1 Tcl/Tk @@ -439,19 +451,6 @@ Download the necessary archive from https://www.vtk.org/VTK/resources/software.h make install -@subsection dev_guides__building_3rdparty_linux_4 Installation From Official Repositories - -**Debian-based distributives** - -All 3rd-party products required for building of OCCT could be installed -from official repositories. You may install them from console using apt-get utility: - - sudo apt-get install tcllib tklib tcl-dev tk-dev libfreetype-dev libxt-dev libxmu-dev libxi-dev libgl1-mesa-dev libfreeimage-dev - -Building is possible with C++ compliant compiler: - - sudo apt-get install g++ - @section build_3rdparty_macos Mac OS X This document presents additional guidelines for building third-party products