X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=INSTALL.cmake;h=e100baacca5a499b526695048d4a40faa7eceb15;hb=20487d93a6b5cb4de1b07afb925ce3965497f8ee;hp=d50dc9b8078c4e89325276a7be688ea9662e4022;hpb=b2613e0d9cb8bcda09455cc6e88cde71a5d1ea38;p=lyx.git

diff --git a/INSTALL.cmake b/INSTALL.cmake
index d50dc9b807..e100baacca 100644
--- a/INSTALL.cmake
+++ b/INSTALL.cmake
@@ -16,13 +16,25 @@ Building LyX with CMake
         Linux/Unix: export PATH=<your path to qt>/bin:$PATH
         Windows   : set PATH=<your path to qt>\bin;%PATH%
     
-    
+    When you wanna run LyX without installing from a out-of-source
+    build directory you have to set the environment variable LYX_DIR_20x
+    and it must point to the lib dir in the source tree.
+        Linux/Unix: export LYX_DIR_20x=<lyx-source>/lib
+        Windows   : set LYX_DIR_20x=<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.devel.lyx.org/pub/contrib/windows/bin
+                or use the option LYX_DEPENDENCIES_DOWNLOAD, then you have to add
+                these paths to your PATH variable:
+                  <build-dir>\msvc2010-deps\deps20\bin
+                  <build-dir>\msvc2010-deps\deps20\python
+                  <build-dir>\msvc2010-deps\deps20\imagemagick
+                  <build-dir>\msvc2010-deps\deps20\ghostscript
+                  <build-dir>\msvc2010-deps\deps20\gettext-tools
+
         If cmake couldn't find these modules set GNUWIN32_DIR, eg. 
         -DGNUWIN32_DIR=c:\gnuwin32. By default cmake searches in your 
         program folder. Or use the cmake GUI to set the GNUWIN32_DIR path.
@@ -148,7 +160,8 @@ Build options
     -- LYX_CONSOLE              = ON     : Show console on Windows
     -- LYX_VLD                  = OFF    : Use VLD with MSVC
     -- LYX_WALL                 = OFF    : Enable all warnings
-    -- LYX_LYX_CONFIGURE_CHECKS = OFF    : Also run configure checks for MSVC
+    -- LYX_CONFIGURE_CHECKS     = OFF    : Also run configure checks for MSVC
+    -- LYX_DEPENDENCIES_DOWNLOAD= OFF    : Download precompiled 3rd party libraries for MSVC 10