anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 01:08:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
22,599 Commits 31 Branches 172 Tags 629 MiB
125eb6d180
Commit Graph

114 Commits

Author SHA1 Message Date
Joost Verburg
a89c67907b adjust LYX_INSTALL to set the CMake options which are currently being used for official 1.6 releases 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37654 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-14 15:14:17 +00:00
Peter Kümmel
b909835903 no shared lyx libraries are supported 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@37199 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-13 14:30:43 +00:00
Kornel Benko
e48d82a985 Added missing debian dependency for aiksaurus 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@35246 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-31 13:52:35 +00:00
Kornel Benko
fdf6b3a85b 1.) Removed the unconditional set of option LYX_MERGE_FILES if option 
LYX_INSTALL set.
  Does not compile on ubuntu.
2.) Backport translations handling from trunk


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34975 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 15:25:48 +00:00
Kornel Benko
b1cfb13446 Add CPack unconditionally again 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34960 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 06:23:40 +00:00
Peter Kümmel
d0db7a9954 cmake: split out FindEnchant.cmake 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34928 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 11:04:05 +00:00
Peter Kümmel
8383ec013f cmake: add Aiksaurus option, fix build system for Aiksaurus 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34926 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 10:31:20 +00:00
Peter Kümmel
02a847a9bc cmake: move definitions to config.h 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34924 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 09:23:10 +00:00
Peter Kümmel
1e4d1655d2 cmake: when installing use default for several options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34923 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 09:10:44 +00:00
Peter Kümmel
5c5cdfc7d0 cmake: userdir is LyX16 now 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34895 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-14 11:48:24 +00:00
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