INSTALL.cmake: typos, grammar, and whitespace

This commit is contained in:
Scott Kostyshak 2013-01-30 01:45:42 -05:00
parent 14d388e0db
commit b8eb4bb99b

View File

@ -16,7 +16,7 @@ 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
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
and it must point to the lib dir in the source tree.
Linux/Unix: export LYX_DIR_21x=<lyx-source>/lib
@ -35,7 +35,7 @@ Building LyX with CMake
<build-dir>\msvc2010-deps\deps20\ghostscript
<build-dir>\msvc2010-deps\deps20\gettext-tools
If cmake couldn't find these modules set GNUWIN32_DIR, eg.
If cmake couldn't find these modules set GNUWIN32_DIR, e.g.
-DGNUWIN32_DIR=c:\gnuwin32. By default cmake searches in your
program folder. Or use the cmake GUI to set the GNUWIN32_DIR path.
@ -62,15 +62,15 @@ Generating build system files
Building out-of-source
-----------------------
The standard way of using CMake is to build in a folder which doesn't resides
in the source tree. This has the advantage, that a complete fresh build could
be done by simply deleting all files in the build folder and to re-run cmake
The standard way of using CMake is to build in a folder that doesn't reside
in the source tree. This has the advantage that a complete fresh build could
be done by simply deleting all files in the build folder and re-running cmake
again.
Another benefit of out-of-source builds is that several builds (debug, release,
command-line builds, IDE project files) could all use the same source tree.
Therefore when using cmake create a folder outside of the source tree and
Therefore when using CMake create a folder outside of the source tree and
select this folder when using CMake's GUI, cmake-gui, or go into this folder
when you call cmake from the shell.
@ -83,7 +83,7 @@ Building out-of-source
Using cmake
------------
When calling cmake you must pass the path to the source tree (absolute are relative)
When calling cmake you must pass the path to the source tree (absolute or relative)
and optionally the generator (each system has its own default). Additional arguments
could be passed with the -D prefix.
@ -121,7 +121,7 @@ Using cmake
* Unused source code file
Because cmake scans the directories for *.cpp and *.h files it will also
add files to the build system which are not mentioned to build. To exclude
add files to the build system that are not mentioned to build. To exclude
them change their ending and re-run cmake.
@ -172,22 +172,22 @@ Build options
Using the merged files build
-----------------------------
When the option 'LYX_MERGE_FILES' is used then for each library a files
is generated which includes all source files of this library, this speeds
up compilation about factor 5.
When the option 'LYX_MERGE_FILES' is used then for each library a file
is generated that includes all source files of this library, this speeds
up compilation by a factor of about 5.
When you heavily work on one file you could comment out the relevant
define in the '_allinone_const.C' file, so only the file _allinone_touched.C'
file will be re-compiled again an again.
will be re-compiled again and again.
- Adding new files
When you add new files the merging files have to be rebuild:
When you add new files the merging files have to be rebuilt:
cmake -DLYX_MERGE_REBUILD=1 .
Or start over by completely cleaning the build folder.
Or start over by completely cleaning the build folder.
- Starting over with same configuration
Delete all files but CMakeCache.txt and call
- Starting over with the same configuration
Delete all files except CMakeCache.txt and call
cmake .
@ -200,7 +200,7 @@ Visual Studio C++
'-DLYX_WALL=1 '
and
'-DLYX_WALL=0'
switches back to to /W3,
switches back to to /W3.
To disable a specific warning add it to MSVC_W_DISABLE in
cmake/CMakeLists.txt. To make the warning an error add it
to MSVC_W_ERROR.
@ -215,7 +215,7 @@ Visual Studio C++
Common7\IDE folder into the binary directory.
'vld.ini' is part of lyx.proj where you can configure vld.
The docu for vld could be found in development/Win32/vld, or
The documentation for vld can be found in development/Win32/vld, or
http://www.codeproject.com/tools/visualleakdetector.asp
@ -238,7 +238,7 @@ GCC/Windows (Win2k only works with MSYS, XP?)
Ubuntu/Kubuntu
--------------_
---------------
You need additionally these packages:
* g++
@ -268,7 +268,7 @@ Xcode/Mac
executable is not in an .app bundle. Instead you have to create a
symbolic link to the fonts directory in the place where the executable
is: ln -s .../trunk/lib/fonts .../trunk/../build/bin/Debug/
If you don't do that math character will not show up correctly.
If you don't do that math characters will not show up correctly.
* CMake properly finds the Qt4 library bundles from Trolltech's binary
Qt4 package for Mac. So no need to compile Qt on your own.
@ -276,17 +276,17 @@ Xcode/Mac
Updating the translations
----------
--------------------------
Read README.localization for information on the translation process.
Here we list only the cmake specific part. As with the autotools build
Here we list only the CMake specific part. As with the autotools build
system the translations are only updated on demand.
- Update .po files and create .gmo files (does not touch the source tree):
make translations
- Copy the updated .po files into the source tree for committing:
make update-po
make update-po
- Update the layouttranslations file in the source tree:
make layouttranslations1