Commit Graph

104 Commits

Author SHA1 Message Date
Peter Kümmel
e93c2e656c cmake: also build the tarball with its additional files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34885 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-13 09:04:17 +00:00
Peter Kümmel
9939d7cf2c cmake: rename to LYX_ vars
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34860 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 21:06:29 +00:00
Peter Kümmel
2d1d9631a2 msvc: no TR1 support in branch code, compiler option should be enough
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34853 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 04:09:49 +00:00
Peter Kümmel
ecf6f23b54 msvc: no TR1 support in branch code, disable TR1 when using msvc 10
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34851 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 04:06:45 +00:00
Peter Kümmel
398490ab8f msvc: no TR1 support in branch code, disable TR1 when using msvc 10
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34850 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-11 04:01:26 +00:00
Peter Kümmel
ab121914a9 cmake: no variable project defined
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34848 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 20:21:26 +00:00
Peter Kümmel
a8b2bde2db cmake: don't install to /usr/local/1.6 by default
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34846 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 20:08:31 +00:00
Kornel Benko
a0c929db2a Sync with trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34844 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 19:46:02 +00:00
Peter Kümmel
3d57124029 cmake: fix sync mistake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34842 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 19:23:48 +00:00
Peter Kümmel
ecc1e3c5d0 cmake: sync with trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34839 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 19:03:47 +00:00
Kornel Benko
f67b12286d Use different package name for branch and trunk to enable installation of both at the same time
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34601 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-05 11:20:32 +00:00
Peter Kümmel
79bbc31a0b cmake: also install locale into the resource dir on windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34577 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-01 13:11:26 +00:00
Peter Kümmel
1729663bc7 cmake: install on Windows, sync with trunk, should be uncritical
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34573 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-01 12:24:21 +00:00
Enrico Forestieri
f024c86911 Fix bug #5238: LyX 1.6 fails with non-ascii chars in path (on Windows)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@33577 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-26 13:28:56 +00:00
Kornel Benko
e043d4ff3e Integrate enchant into cmake-build too
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@33192 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-24 10:54:27 +00:00
Kornel Benko
ee1b324d65 Added support for build with aiksaurus
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29398 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-25 13:33:55 +00:00
Kornel Benko
7a2e28c3bf Backport.
Try to avoid use of perl, if there is no perl-command available

Copy po-files only if realy changed.
Avoids annoying po re-building.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29276 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-17 06:36:40 +00:00
Kornel Benko
18b4b2c0c8 whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29275 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-17 06:30:06 +00:00
Kornel Benko
63f86623cc Backport of chanes made in trunk.
The main differecies to trunk is: Project name branchlyx.
        This is so, to be able to install trunk and branch (rpm or debian) package
        simultaneously. As they do not share the same directories it is
        now easy.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28878 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-20 14:54:54 +00:00
Peter Kümmel
475bb8cefd cmake: fix linux install path
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@27827 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-09 20:10:58 +00:00
Enrico Forestieri
bc72d3fc58 Automate setting of LYX_DIR_XXx and LYX_USERDIR_XXx environment variable names.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25898 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-26 10:45:38 +00:00
Peter Kümmel
bdde87d39f disable warning for msvc6 infected developers (scope of for(...,,) declarartions)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25455 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-05 09:50:29 +00:00
Abdelrazak Younes
4241db7c0d CMake external intl unconditionally.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25205 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-09 12:10:15 +00:00
Abdelrazak Younes
258b8a40c5 fix cmake/mac
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25195 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-08 18:45:51 +00:00
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