Amend fd075614

[lyx.git] / INSTALL.cmake

diff --git a/INSTALL.cmake b/INSTALL.cmake
index cbd651262523b0477473a090d2c2c8554cdb25af..ffe5866b006cb7db797ceaaf796a36043428e408 100644 (file)
--- a/INSTALL.cmake
+++ b/INSTALL.cmake
@@ -9,24 +9,24 @@ Building LyX with CMake
 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
 
         On Windows install the supplementary modules:
-        * Visual Studio 2008: ftp://ftp.lyx.org/pub/lyx/contrib/lyx-windows-deps-msvc2008.zip
-        * Visual Studio 2010: ftp://ftp.devel.lyx.org/pub/contrib/windows/bin
+        * Visual Studio 2010: ftp://ftp.lyx.org/pub/lyx/devel/win_deps/lyx20-deps-msvc2010.zip
                 or use the option LYX_DEPENDENCIES_DOWNLOAD, then you have to add
                 these paths to your PATH variable:
                   <build-dir>\msvc2010-deps\deps20\bin
@@ -149,7 +149,6 @@ Build options
     -- LYX_MERGE_REBUILD        = OFF    : Rebuild generated files from merged files build
     -- LYX_QUIET                = OFF    : Don't generate verbose makefiles
     -- LYX_INSTALL_PREFIX       = OFF    : Install path for LyX
-    -- LYX_EXTERNAL_LIBINTL     = ON     : Use external libintl
 
     # GCC specific 
     -- LYX_PROFILE              = OFF    : Build profile version
@@ -158,13 +157,11 @@ Build options
     -- LYX_DEBUG_GLIBC          = OFF    : Enable libstdc++ debug mode
     -- LYX_DEBUG_GLIBC_PEDANTIC = OFF    : Enable libstdc++ pedantic debug mode
     -- LYX_STDLIB_DEBUG         = OFF    : Use debug stdlib
-    -- LYX_CONCEPT_CHECKS       = OFF    : Enable concept-checks
 
     # MSVC specific
     -- 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