Kornel Benko
d03d3e2461
Make it buildable on linux again. (LYX_DATA_SUBDIR is on non-windows defined as '').
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38483 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-23 14:15:32 +00:00
Peter Kümmel
659d68713f
cmake: fix wrong installation path of 'layouttranslations' (the already existing file in lib/)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38474 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-22 12:53:48 +00:00
Kornel Benko
6940947790
Remove layouttranslations from automatic build.
...
To create it, one has to go into the po-build-directory and call
'make layouttranslations1'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38372 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-14 09:01:27 +00:00
Kornel Benko
93f42a3f67
Omiting dependecy recursion for po/layouttranslations in cmake build
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38252 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-05 07:07:20 +00:00
Kornel Benko
4744d2e123
Restore classic in cmake build
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38224 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-03 08:16:36 +00:00
Kornel Benko
428c425a51
Added layouttranslations handling to cmake build
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38174 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-31 07:59:33 +00:00
Peter Kümmel
d4586ba28e
find gettext tools
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38087 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-27 23:35:13 +00:00
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
Kornel Benko
fad3b780e6
Do install only really wanted files in scripts
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38045 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 13:51:59 +00:00
Kornel Benko
ec36884e80
Add oxygen and liber icons to cmake build
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38042 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 06:35:27 +00:00
Joost Verburg
318206c4b5
also install R scripts
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38036 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 23:17:21 +00:00
Joost Verburg
06a45f16a7
install thesis template
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38032 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 22:02:21 +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
25274723b0
cmake: fix wrong install path
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37925 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-14 23:26:00 +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
715d9784f1
cmake: don't add lyx.rc as info file
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37776 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-23 18:53:56 +00:00
Joost Verburg
6db49535bf
Do not set all CMake files as C header files. This fixes resource compilation.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37702 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-16 20:51:40 +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
898eaf4ac7
cmake: give a hint that it is possible to download 3rd party libs
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37658 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-14 19:26:33 +00:00
Peter Kümmel
58d9848d93
cmake: fix merged build
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37596 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-11 02:20:23 +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
Kornel Benko
4a8698c808
Define LYX_(MAJOR|MINOR)_VERSION also for cmake build
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37580 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 06:16:12 +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
8f8aab094d
cmake: also add gifs to resources
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37317 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-24 11:50:13 +00:00
Stephan Witt
2b8bdd5b34
since r37306 tex2lyx uses src/LayoutFile too
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37307 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-24 08:34:31 +00:00
Peter Kümmel
a2435792ce
cmake: add ui files
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37303 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 18:58:26 +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
51558fbf23
cmake: we have 2011 and more white space changes, won't call it "use tabs" ;)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37175 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 23:28:52 +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
cdb3b00033
cmake: cmake is really a strange macro language
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37173 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 23:01:13 +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
715b9e92bd
cmake: make the merged build much more usable by adding all the source files to the IDE
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37169 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-10 22:47:58 +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
Peter Kümmel
759eb1826d
cmake: also build merged on mac
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37152 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-08 17:16:12 +00:00
Peter Kümmel
e4ecc7ff1c
cmake: add all info files and the cmake macros
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37137 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 18:57:49 +00:00
Peter Kümmel
69c8dd36ba
cmake: add all info files and the cmake macros
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37136 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-06 18:54:25 +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
b308435f04
Mark created moc-files as GENERATED
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35576 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-08 06:00:10 +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