Commit Graph

80 Commits

Author SHA1 Message Date
Peter Kümmel
c33b30fd84 cmake: use 2.4 behavior also for cmake 2.6
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24926 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-24 21:22:36 +00:00
Peter Kümmel
69f1cd1e50 cmake: don't forget arg for build type
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24383 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 12:18:22 +00:00
Peter Kümmel
5844446857 external libintl: fix nls compiler error
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24382 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 12:09:56 +00:00
Peter Kümmel
f7d5c40b6c MinGW is too slow with O3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24348 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 12:00:53 +00:00
Peter Kümmel
eb987d20db MinGW fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24346 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 10:17:40 +00:00
Peter Kümmel
eaa86aaaf7 cmake: verbose makefiles also for mingw
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24343 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 09:19:30 +00:00
Peter Kümmel
527d3ac174 cmake: skip configure checks only for msvc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24341 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 09:08:29 +00:00
Peter Kümmel
1500d274b4 cmake: use external libintl on windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24338 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 08:47:33 +00:00
Peter Kümmel
f6de6828ef cmake: also build with win32libs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24295 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-16 16:47:12 +00:00
Abdelrazak Younes
7650cbf9fd Fix CMake-2.6
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24258 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-15 13:57:54 +00:00
André Pönitz
976f4d891e remove unused defines QT_CLEAN_NAMESPACE and QT_GENUINE_STR
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23869 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-21 15:12:46 +00:00
Peter Kümmel
d0ee9f494d cmake: disable warning 4355
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21916 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-02 12:08:52 +00:00
Peter Kümmel
e80d447ad2 vld LyX/cmake integration
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21912 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-02 11:17:01 +00:00
Peter Kümmel
eec779b2c9 cmake: buffer msvc's compiler settings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21908 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-02 10:29:25 +00:00
Peter Kümmel
8b5c9ef568 time goes by
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21831 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-27 20:32:25 +00:00
Peter Kümmel
7346ca40a1 cmake: update version info. Is there a build system independent way?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21078 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-20 09:34:19 +00:00
Peter Kümmel
143dfdc9d3 cmake: fix broken pch support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21077 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-20 09:32:35 +00:00
André Pönitz
e7d203167a Change some .C -> .cpp
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20789 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-06 16:23:02 +00:00
Abdelrazak Younes
9a8fd53e8f CMake: Supress regeneration.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20096 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-06 09:18:40 +00:00
André Pönitz
055c95cc19 more cmake cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19873 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-28 20:47:42 +00:00
André Pönitz
83c9b040e7 cmake cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19871 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-28 19:54:42 +00:00
André Pönitz
b839dd33ae some attempt at cmake beautification
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19862 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-28 17:07:02 +00:00
Peter Kümmel
091b334152 fix cmake build for tex2lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19803 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-26 08:51:47 +00:00
Peter Kümmel
f137d5bdad don't pollute the namespace with Qt macros
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19630 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-18 12:45:11 +00:00
Peter Kümmel
329d8d1332 update to new version.cpp
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19628 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-18 12:09:08 +00:00
Peter Kümmel
1feaf6c814 plosh output. We need a string for LYX_DATE
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19049 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-11 18:41:37 +00:00
Peter Kümmel
830fb29a15 so it could not be forgotten by me
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19048 a592a061-630c-0410-9148-cb99ea01b6c8
2007-07-11 18:33:54 +00:00
Stefan Schimanski
14af4831c4 * added MacOSX packaging
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18558 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-29 14:06:35 +00:00
Peter Kümmel
3c4cfcbbdd cmake: initial install support, only copying files is working
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18176 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-02 20:59:48 +00:00
Abdelrazak Younes
38f9e35ab1 fix Cmake for the .C -> .cpp changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18034 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 12:06:02 +00:00
Peter Kümmel
5e1404b1f7 cmake: file renaming -> be ready for any and everything
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17921 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-23 16:52:27 +00:00
Peter Kümmel
bc448a7ef5 cmake : remember command line options merge and WALL
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17819 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-15 13:09:34 +00:00
Peter Kümmel
e76303e727 cmake: force verbose make files, add output for disable wall
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17797 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-13 13:46:59 +00:00
Peter Kümmel
afd9d1b40a cmake: remove warning about const const, don't use pchs when compiling merged
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17721 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-04 19:07:43 +00:00
Peter Kümmel
6db20c6d9d cmake: fix C&P error
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17620 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-28 20:54:37 +00:00
Peter Kümmel
339e505587 cmake: force to new build type when reconfiguring
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17616 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-28 19:23:57 +00:00
Peter Kümmel
5fc2e3efc8 cmake: add shared library support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17599 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-27 18:26:36 +00:00
Peter Kümmel
d44b37a373 cmake: show full command
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17581 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-26 20:21:41 +00:00
Peter Kümmel
ff0633599b cmake: force new build type
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17577 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-26 18:50:41 +00:00
Peter Kümmel
e11abd6c2e disable requirement for 2.4.4 version
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17562 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-26 06:55:16 +00:00
Peter Kümmel
745c9e91fd cmake:
- add flags for debug/release/profile
 - also build qt4 as one file with gcc
 
 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17558 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-25 22:03:59 +00:00
Peter Kümmel
3a74b10d91 also improve build times when working on some files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17530 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-24 11:33:03 +00:00
Peter Kümmel
e0b6c1865e msvc: don't #define max and min
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17516 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-22 23:42:21 +00:00
Peter Kümmel
a016215367 some more small changes to speed up the compilation time by merged files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17498 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-21 21:22:10 +00:00
Peter Kümmel
531e4b726d cmake build system:
Add "merge" option which minimizes the number of files to build.
   only the qt4 and boost files will not merged into one file.
   This really speeds up the compilation.
   Usage:
     cmake ../trunk/development/cmake -Dmerge=1



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17495 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-20 22:13:21 +00:00
Peter Kümmel
45e7e717d4 remove some msvc warnings
* src/mathed/InsetMathNest.C : 
	unreachable code
* src/aspell_local.h : 
	aspell is a Clibrary, no class keyword available
* src/texrow.h : 
	could not generate standard constructor
* development/cmake/CMakeLists.txt : 
	- disable same warnings
    - all size_t/int related warnings are disabled



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16446 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-30 21:05:44 +00:00
Peter Kümmel
4fe3d7d426 also warnings as errors with /W3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16440 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-30 13:53:34 +00:00
Peter Kümmel
2debe65559 don't show all warnings by default, use TOP_SRC_DIR value from LyXPaths.cmake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16387 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-23 21:30:17 +00:00
Abdelrazak Younes
6c648c13a8 TOP_SRCDIR is needed, but LOCALEDIR and LYX_DIR refer to
installation directories.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16380 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-22 12:41:25 +00:00
Abdelrazak Younes
9f42a6349f PROGRAM_SUFFIX represents a possible version suffix, better let it empty for now. Georg explication of how autotools handle that:
configure --with-version-suffix=-1.5

results in a PROGRAM_SUFFIX of "-1.5". This is important for the name of 
the personal LyX dir, and the name of the executables if you want to 
install several LyX versions in parallel without interference.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16364 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-21 14:07:33 +00:00