Commit Graph

192 Commits

Author SHA1 Message Date
Peter Kümmel
ce7fee0333 cmake: find downloaded python
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38077 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-27 20:13:47 +00:00
Peter Kümmel
142774716c cmake: install prefix is a path
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37926 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-14 23:26:28 +00:00
Peter Kümmel
4620034eda Fix crash when using msvc10's regex, seems boost's regex couldn't replaced by msvc's in ECMAScrip mode.
Solution: use boost also for msvc10

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37832 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 21:28:36 +00:00
Peter Kümmel
ef1444b8df cmake: complete renaming of LYX_3RDPARTY_DOWNLOAD
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37675 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-15 09:46:14 +00:00
Joost Verburg
6f765737f8 update for new MSVC 2010 dependencies package lyx20-deps-msvc2010-x86.zip (all dependencies in one zip)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37670 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-14 22:04:58 +00:00
Peter Kümmel
69fc2ddac4 cmake: support source packaging
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37590 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 22:44:59 +00:00
Peter Kümmel
40dcf20b5d cmake: add option to download msvc 10 3rd party libraries
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37370 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-30 10:23:29 +00:00
Peter Kümmel
75f8899736 cmake: install path is already relative to the binary dir when the path is not absolute
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37302 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 15:14:47 +00:00
Peter Kümmel
c31897b09c cmake: make package_source work.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37299 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 12:38:54 +00:00
Peter Kümmel
d8e5e13690 cmake: don't write options changed because of dependencies into the cache, this way it is possible to switch on/off options with all it dependencies.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37296 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 11:48:39 +00:00
Peter Kümmel
2e516e9204 sort options by compiler
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37295 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 11:35:50 +00:00
Peter Kümmel
93e60a9727 cmake: now having the options output at the end we could make some dependency checking for option without having an out-dated output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37294 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 11:23:27 +00:00
Peter Kümmel
9e9948c6ad cmake: make options more consistent
Before we set LyX 2.0 in stone by releasing it, 
I clean up the cmake's build option naming:

- only positive naming (remplace NO_, DISBALE_ names)
- short names when it is clear what the option means (no USE_)
- no redundant option RELEASE=0 is a debug build


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37293 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 10:53:54 +00:00
Peter Kümmel
da246c7e44 cmake: don't show outdated build options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37291 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 09:27:06 +00:00
Peter Kümmel
a874b38455 no shared lyx libraries are supported
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37200 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-13 14:31:02 +00:00
Peter Kümmel
707eeb22fb cmake: we have 2011 and more white space changes, won't call "use tabs" ;)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37174 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 23:24:00 +00:00
Peter Kümmel
78b8dc905b cmake: add the CMakeLists files, so cmake will check if a cmake file has changed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37170 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 22:49:12 +00:00
Peter Kümmel
23609ed7fb camke: when checking for a variable then also use it
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37154 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-09 00:55:40 +00:00
Vincent van Ravesteijn
aa0aae25f2 Add DEVEL_VERSION to cmake.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36952 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-19 22:54:45 +00:00
Pavel Sanda
8f5acc63c4 Replay r36746
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36755 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-07 00:13:16 +00:00
Pavel Sanda
c68d754a74 Revert commits from 36745
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36749 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-07 00:05:40 +00:00
Peter Kümmel
56e0cfd582 cmake: add option to rebuild merged files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36746 a592a061-630c-0410-9148-cb99ea01b6c8
2010-12-06 20:55:05 +00:00
Kornel Benko
689036c419 Upgrade for use witn boost 1.40 on debian (iff using external boost)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35556 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-03 12:31:27 +00:00
Kornel Benko
4054d8624b Set destdir for cpack correctly again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35267 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-02 11:50:05 +00:00
Stephan Witt
3b403d4585 add needed quotes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35265 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-02 08:28:34 +00:00
Peter Kümmel
d85f8c115f add -Wunused-parameter
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35264 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-02 07:39:48 +00:00
Peter Kümmel
0e482e2392 tabify, cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35263 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-02 06:59:58 +00:00
Peter Kümmel
602e7d9d05 add LYX_INSTALL_PREFIX
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35256 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-01 14:20:04 +00:00
Kornel Benko
bf72a8097a Add ddebian dependncies, remove unneeded aiksaurus
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35253 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-01 09:41:14 +00:00
Peter Kümmel
54cc2befd6 cmake: show correct option values
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34980 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 21:01:44 +00:00
Peter Kümmel
8ea2da4c3c cmake: disbale CPACK by default, it triggers too much requirements
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34979 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 20:47:59 +00:00
Kornel Benko
8ffb386899 1.) Removed the unconditional set of option LYX_MERGE_FILES if option
LYX_INSTALL set.
    Does not compile on ubuntu.
2.) translations handling depends now from LYX_CPACK option
  if CPACK option not set translations will be done only if
  explicitly specified on the command line for make e.g.
  ==> make translations


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34976 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 15:30:54 +00:00
Peter Kümmel
99160cd715 cmkae: more cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34966 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 09:46:46 +00:00
Peter Kümmel
23cfb00ef1 cmake: more cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34964 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 07:38:00 +00:00
Peter Kümmel
9060f01aa8 cmake: split out FindHunspell.cmake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34961 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 06:47:01 +00:00
Kornel Benko
7053bbf977 Add CPack unconditionally again
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34959 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-18 06:22:20 +00:00
Peter Kümmel
f151f3a30f cmake: sync with branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34953 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 22:24:08 +00:00
Peter Kümmel
c09d33120d UNDO: enc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34943 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 16:09:26 +00:00
Peter Kümmel
56a7a67783 add first version of .lyx file encryption. It's disabled by default and could out-of-the-box only by compiled on Linux with cmake and with openssl-devel packeges.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34931 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-17 12:26:11 +00:00
Peter Kümmel
0708686f69 cmake: move remaining ungrounded entries into LYX_ group
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34897 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-14 15:30:31 +00:00
Peter Kümmel
4ab78db6b4 cmake: disbale LYX_INSTALL by default, when set enable other relevant options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34896 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-14 11:58:21 +00:00
Peter Kümmel
264ba86334 cmake: sync with branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34887 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-13 09:39:05 +00:00
Peter Kümmel
dbe3c9a05f cmake: don't install to /usr/local/2.0 by default
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34847 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-10 20:20:54 +00:00
Kornel Benko
b5ec78f6e5 Removed _one_ perl-dependency in creating po-files.
'cat.py' created by Richard Heck

This script resembles the unix command 'cat', valid now on every
platform.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34828 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-09 19:02:04 +00:00
Kornel Benko
9fc93b0190 Check for python before updating po-files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34827 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-09 16:11:44 +00:00
Peter Kümmel
f8620690b6 cmake: no version suffix for binaries on windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34821 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-09 08:39:25 +00:00
Peter Kümmel
8ed3c9ce25 cmake: also use external libintl on windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34819 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-09 08:16:06 +00:00
Peter Kümmel
4694059150 cmake: also use external libintl on windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34818 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-09 08:15:31 +00:00
Peter Kümmel
07eef68a90 cmake: only set and show compiler relevant options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34803 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-07 22:26:36 +00:00
Peter Kümmel
b9a447febf cmake: typos, option grouping
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34791 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-06 20:10:28 +00:00