yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3857
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Wed 2016-05-11 21:09:20 +0200
message:
  Set Qt5 by default.
  
  Update installation page.
modified:
  CMakeLists.txt
  doc/sphinx/installation.rst


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-24 22:08:26 +0000
+++ CMakeLists.txt	2016-05-11 19:09:20 +0000
@@ -23,7 +23,7 @@
 #  runtimePREFIX: used for packaging, when install directory is not the same is runtime directory (/usr/local by default)
 #  CHUNKSIZE: set >1, if you want several sources to be compiled at once. Increases compilation speed and RAM-consumption during it (1 by default)
 #  VECTORIZE: enables vectorization and alignment in Eigen3 library, experimental (OFF by default)
-#  USE_QT5: use QT5 for GUI, experimental (OFF by default)
+#  USE_QT5: use QT5 for GUI (ON by default)
 
 project(Yade C CXX)
 cmake_minimum_required(VERSION 2.8.11)
@@ -131,7 +131,7 @@
 OPTION(ENABLE_MASK_ARBITRARY "Enable arbitrary precision of bitmask variables (only Body::groupMask yet implemented) (experimental). Use -DMASK_ARBITRARY_SIZE=int to set number of used bits (256 by default)" OFF)
 OPTION(ENABLE_PROFILING "Enable profiling, e.g. shows some more metrics, which can define bottlenecks of the code (OFF by default)" OFF)
 OPTION(ENABLE_POTENTIAL_PARTICLES "Enable potential particles" OFF)
-OPTION(USE_QT5 "USE Qt5 for GUI" OFF)
+OPTION(USE_QT5 "USE Qt5 for GUI" ON)
 
 #===========================================================
 # Use Eigen3 by default

=== modified file 'doc/sphinx/installation.rst'
--- doc/sphinx/installation.rst	2016-04-21 14:58:26 +0000
+++ doc/sphinx/installation.rst	2016-05-11 19:09:20 +0000
@@ -143,8 +143,8 @@
 		sudo apt-get install cmake git freeglut3-dev libloki-dev \
 		libboost-all-dev fakeroot dpkg-dev build-essential g++ \
 		python-dev ipython python-matplotlib libsqlite3-dev python-numpy python-tk gnuplot \
-		libgts-dev python-pygraphviz libvtk5-dev python-scientific libeigen3-dev \
-		python-xlib python-qt4 pyqt4-dev-tools gtk2-engines-pixbuf python-argparse \
+		libgts-dev python-pygraphviz libvtk6-dev python-numpy libeigen3-dev \
+		python-xlib python-pyqt5 pyqt5-dev-tools gtk2-engines-pixbuf python-argparse \
 		libqglviewer-dev python-imaging libjs-jquery python-sphinx python-git python-bibtex \
 		libxmu-dev libxi-dev libcgal-dev help2man libbz2-dev zlib1g-dev python-minieigen
 		
@@ -244,16 +244,6 @@
 For using more extended parameters of cmake, please follow the corresponding
 documentation on `https://cmake.org/documentation <https://cmake.org/documentation/>`_. 
 
-.. warning:: To provide Qt4->Qt5 migration one needs to provide an additional option USE_QT5.
- This option should be ON or OFF according to the Qt version, which was used
- to compile libQGLViewer. On Debian/Ubuntu operating systems libQGLViewer
- of version 2.6.3 and higher are compiled against Qt5 (for other operating systems
- refer to the package archive of your distribution), so if you are using
- such version, please switch this option ON. Otherwise, if you mix Qt-versions a
- ``Segmentation fault`` will appear just after Yade is started. To provide
- necessary build dependencies for Qt5, install ``python-pyqt5 pyqt5-dev-tools``
- instead of ``python-qt4 pyqt4-dev-tools``.
-
 If cmake finishes without errors, you will see all enabled 
 and disabled options at the end. Then start the actual compilation process with::