anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-12 22:14:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: update Readme

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33869 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-03-25 21:37:42 +00:00
parent 13633b346e
commit 15f850609c
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
INSTALL.cmake
View File

@ -9,37 +9,31 @@ July, 2007
All systems All systems
=========== ===========
* CMake 2.4 or CVS version from www.cmake.org * CMake or CVS version from www.cmake.org
* Install Qt 4 and make sure qmake 4 is found * Install Qt 4 and make sure qmake 4 is found
(add the folder with qmake to the environment variable PATH). (add the folder with qmake to the environment variable PATH,
e.g. set PATH=<your path to qt>\bin;%PATH%).
* Faster build process: with file merging enabled compilation
is up to 5 times faster: '-Dmerge=1'.
To force a complete regeneration of the created files use
'-Dmerge_rebuild=1'.
Windows only Windows only
============= =============
Install the windows supplementary modules Install the windows supplementary modules:
* as described in INSTALL.scons Download ftp://ftp.lyx.org/pub/lyx/contrib/lyx-windows-deps-msvc2008.zip
* install win32libs with the 'KDE on Windows' installer and extract in the root directory of your LyX files (so you will get
http://download.cegit.de/kde-windows/installer/ a directory called lyx-windows-deps-msvc2008 next to the other directories
- use the msvc packages like src, development etc.).
- a release version of Qt is also available by the installer
If cmake couldn't find these modules set GNUWIN32_DIR, eg. If cmake couldn't find these modules set GNUWIN32_DIR, eg.
-DGNUWIN32_DIR=c:\gnuwin32. By default cmake searches in your -DGNUWIN32_DIR=c:\gnuwin32. By default cmake searches in your
program folder program folder
Building Visual C++ 2005 project files Building Visual C++ project files
-------------------------------------- --------------------------------------
* install Visual C++ 2005 * install Visual C++ 2008
* install Platform SDK 2005, "Core" and "Web Workshop" * install Platform SDK 2008, "Core" and "Web Workshop"
* add include and library paths of the SDK to the IDE search paths. * add include and library paths of the SDK to the IDE search paths.
Menu entry: Tools->Options->'VC++ directories'->'Library files' and 'Include files' Menu entry: Tools->Options->'VC++ directories'->'Library files' and 'Include files'
* create a build directory, e.g. ..\trunk\..\build * create a build directory, e.g. ..\trunk\..\build
@ -72,8 +66,6 @@ Building Visual C++ 2005 project files
Some tips: Some tips:
* rename Microsoft Visual Studio 8\VC\vcpackages\feacp.dll
to disable Intellisense
* the Release build links much faster * the Release build links much faster
* for the 'Debug' and 'Release' build all precompiled headers are enabled * for the 'Debug' and 'Release' build all precompiled headers are enabled
to compile without pch (non file merge mode) This is usefull to check to compile without pch (non file merge mode) This is usefull to check
@ -140,6 +132,19 @@ Some tips:
Experts only:
* Faster build process: with file merging enabled compilation
is up to 5 times faster: '-Dmerge=1'.
To force a complete regeneration of the created files use
'-Dmerge_rebuild=1'.
* install win32libs with the 'KDE on Windows' installer
http://download.cegit.de/kde-windows/installer/
- use the msvc packages
- a release version of Qt is also available by the installer
To generate other build files call 'cmake' To generate other build files call 'cmake'
which shows a list of possibilities. which shows a list of possibilities.

2
development/cmake/CMakeLists.txt
View File

@ -174,7 +174,7 @@ if(NOT MSVC)
set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCPP_CONCEPT_CHECKS") set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCPP_CONCEPT_CHECKS")
endif() endif()
set(CMAKE_CXX_FLAGS "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE) set(CMAKE_CXX_FLAGS "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "${LYX_CXX_FLAGS} -fno-strict-aliasing -O -g -D_DEBUG" CACHE TYPE STRING FORCE) set(CMAKE_CXX_FLAGS_DEBUG "${LYX_CXX_FLAGS} -fno-strict-aliasing -O -D_DEBUG" CACHE TYPE STRING FORCE)
if(MINGW) if(MINGW)
set(CMAKE_CXX_FLAGS_RELEASE "${LYX_CXX_FLAGS} -O2 -DNDEBUG" CACHE TYPE STRING FORCE) set(CMAKE_CXX_FLAGS_RELEASE "${LYX_CXX_FLAGS} -O2 -DNDEBUG" CACHE TYPE STRING FORCE)
else() else()