Enable dissolve in undefined Flex inset context menu

[lyx.git] / INSTALL.cmake

diff --git a/INSTALL.cmake b/INSTALL.cmake
index 420102a8a315f81ea76c4ef328314346cc26de2e..540b68e698c067aa598bff2d4b1821c044740839 100644 (file)
--- a/INSTALL.cmake
+++ b/INSTALL.cmake
@@ -2,25 +2,26 @@
 Building LyX with CMake
 =========================
 
-    Install CMake from www.cmake.org or your distribution (version >= 2.6.4).
+    Install CMake from www.cmake.org or your distribution (version >= 3.1.0).
 
 
 
 3rd party libraries
 --------------------
 
-    Install Qt 4 and make sure qmake is found.
+    Install Qt 4 or Qt 5 and make sure qmake is found.
         Add the folder with qmake to the environment variable PATH.
         If you've compiled Qt by yourself or qmake is not found after
         installing Qt fix PATH,
         Linux/Unix: export PATH=<your path to qt>/bin:$PATH
         Windows   : set PATH=<your path to qt>\bin;%PATH%
+        If you use Qt 5, use -DLYX_USE_QT=QT5, otherwise Qt 4 will be searched.
 
     When you want to run LyX without installing from an out-of-source
-    build directory you have to set the environment variable LYX_DIR_21x
+    build directory you have to set the environment variable LYX_DIR_22x
     and it must point to the lib dir in the source tree.
-        Linux/Unix: export LYX_DIR_21x=<lyx-source>/lib
-        Windows   : set LYX_DIR_21x=<lyx-source>\lib
+        Linux/Unix: export LYX_DIR_22x=<lyx-source>/lib
+        Windows   : set LYX_DIR_22x=<lyx-source>\lib
 
     Windows specific
 
@@ -140,7 +141,6 @@ Build options
     -- LYX_ASPELL               = OFF    : Require aspell
     -- LYX_ENCHANT              = OFF    : Require Enchant
     -- LYX_HUNSPELL             = OFF    : Require Hunspell
-    -- LYX_DEVEL_VERSION        = OFF    : Build developer version
     -- LYX_RELEASE              = OFF    : Build release version, build debug when disabled
     -- LYX_PACKAGE_SUFFIX       = ON     : Use version suffix for packaging
     -- LYX_PCH                  = OFF    : Use precompiled headers
@@ -161,7 +161,6 @@ Build options
     -- LYX_CONSOLE              = ON     : Show console on Windows
     -- LYX_VLD                  = OFF    : Use VLD with MSVC
     -- LYX_WALL                 = OFF    : Enable all warnings
-    -- LYX_CONFIGURE_CHECKS     = OFF    : Also run configure checks for MSVC
     -- LYX_DEPENDENCIES_DOWNLOAD= OFF    : Download precompiled 3rd party libraries for MSVC 10