anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 10:40:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,805 Commits 31 Branches 172 Tags 618 MiB
4f36bac7ae
Commit Graph

552 Commits

Author SHA1 Message Date
Peter Kümmel
9906953921 cmake on mac: precompiled libintl comes from ports, then also use iconv from ports, this is necessary to fix linker errors and removes the cmake warning 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38731 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-12 21:48:11 +00:00
Kornel Benko
583627bfb4 Added missing cmakedefines to intl 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38724 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-12 17:12:08 +00:00
Peter Kümmel
e6ad9489cf cmake: we already test on gettext 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38716 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-12 04:22:14 +00:00
Peter Kümmel
842f0d3d44 cmake: -Dhelp=1 lists all options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38696 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-10 20:25:31 +00:00
Peter Kümmel
ce4cdf2258 cmake: enable in-source CMakeLists.txt files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38692 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-10 18:04:49 +00:00
Kornel Benko
de46406e8d Moved development/cmake/CMakeLists.txt into top level 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38678 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-09 21:54:31 +00:00
Kornel Benko
1d23f8bf79 While using internal libintl, make sure it is uptodate before linking lyx 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38631 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-08 09:19:12 +00:00
Kornel Benko
2ff1181e52 Make installed python scripts executable (as in autotools) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38627 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-08 07:28:19 +00:00
Peter Kümmel
fc5060a5e6 fix win32 linker errors 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38614 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-07 13:01:30 +00:00
Peter Kümmel
0ba6efb073 cmake: CMAKE_SOURCE_DIR has changed 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38612 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-07 11:55:06 +00:00
Peter Kümmel
f81f512390 cmake: remove obsolete comment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38610 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-07 11:34:22 +00:00
Kornel Benko
d096463859 New cmake build from top source dir 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38608 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-07 10:38:22 +00:00
Kornel Benko
45b61c6ecf 1.) Corrected internal compilation for Libintl 
2.) Changed cmake-files accordingly
Patch from Jean-Marc Lasgouttes


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38606 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-06 19:24:54 +00:00
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
Uwe Stöhr
c4815d37aa CMake build.bat: don't create a directory that already exists 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35279 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-04 13:52:27 +00:00
Uwe Stöhr
503be7c2ce CMake build.bat: 
- fix typo
- return to start path

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35274 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-04 02:05:11 +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
1dee0c67e5 installed lyx doesn't need LYX_DIR_20x 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35258 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-01 16:07:29 +00:00
Peter Kümmel
c865c9021e fix typos 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35257 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-01 14:29:13 +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
Peter Kümmel
9f55627b2e update build.bat 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35255 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-01 14:19:30 +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
Uwe Stöhr
1b387db8aa CMAKE: re-enable compilation - fix by Stephan 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35248 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-31 22:25:28 +00:00
Stephan Witt
f494131d06 add missing check for setenv: environment.cpp and POSIX standards prefer setenv 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35194 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-25 05:57:06 +00:00
Kornel Benko
9d09dca920 Restore language handling 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35107 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-09 18:49:34 +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
d45859d337 typo 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34978 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 15:47:28 +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
53bddc751e cmake: fix typo 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34968 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 10:32: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
Kornel Benko
0bcf9a01a0 Remove translation target from automatic creation 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34963 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 07:11:42 +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
153bc82d63 cmake: linux is case sensitive 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34957 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 23:23:09 +00:00
Peter Kümmel
19c3bff281 cmake: linux fixes 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34956 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 23:12:50 +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
Kornel Benko
29bb9c9b57 Remove second call tm msgmerge' The diffs in created po-files 
were because of the sort-flag in for msgmerge.

Now the outcome is identical to automake.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34934 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 12:58:34 +00:00
Kornel Benko
043ff28a99 Modified FindLyXGettext.cmake as to producing the same output as automake 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34932 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 12:37:37 +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
Kornel Benko
476d7a9df7 Sorry, vorgotten a dependency. 
The po-files created with "make update_po_files" differs from their
counterparts in automake. Especially the last part starting with fuzzy
translations.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34930 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 12:04:04 +00:00
Kornel Benko
05dd62a092 Added target 'update_po_files' to remerge po 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34929 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 11:09:10 +00:00
Peter Kümmel
a24a1e3bfe cmake: fix merged build 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34905 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-15 14:25:59 +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
bac078bfc1 Remove now unneeded comment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34843 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-10 19:45:19 +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
Kornel Benko
9ddaad1da8 Sort input files for xgettext the same way as with automake 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34817 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-09 06:07:46 +00:00
Kornel Benko
e2f01217a8 Sort entries in created POTFILES.in 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34814 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-08 11:23:30 +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
Kornel Benko
ef6de90bb5 Remove AppleSpellChecker.* from non-apple platform 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34802 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-07 21:13:39 +00:00
Stephan Witt
0a326e90f7 provide native spell checker for Mac OS X 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34801 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-07 17:40:50 +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
Peter Kümmel
2b99cacec9 cmake: more option cleanup, use LYX_OPTION macro for consistent messages and variable naming 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34790 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-06 19:47:16 +00:00
Kornel Benko
20b7726ab3 Keep options together 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34788 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-06 18:19:53 +00:00
Kornel Benko
c803547a97 Set group LYX for used options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34779 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-06 05:42:45 +00:00
Peter Kümmel
5006961952 TR1: enable 4.4.0 and mingw 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34733 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-30 14:30:10 +00:00
Peter Kümmel
69036ced37 TR1: move TR1 check to config.h / buildsystem 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34729 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-30 10:53:45 +00:00
Peter Kümmel
103310c401 TR1: check in cmake for GCC version, fallback in checktr1.h for other build systems, no support of regex in gcc 4.4 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34728 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-30 08:47:41 +00:00
Peter Kümmel
f3137da47c cmake: add icon on Windows 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34727 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-30 08:35:52 +00:00
Peter Kümmel
615d42d357 TR1: use std::tr1 regex with msvc10 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34725 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-29 17:09:40 +00:00
Peter Kümmel
92d4d7c061 cmake: build debugging symbols for debug builds 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34606 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-06 10:31:46 +00:00
Peter Kümmel
5f2de40786 cmake: also install locale into the resource dir on windows 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34579 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-01 13:32:10 +00:00
Peter Kümmel
fa59b92276 cmake: also install locale into the resource dir on windows 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34576 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-01 13:11:03 +00:00
Stephan Witt
c45d20be90 Server.cpp needs moc on WIN32 only 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34551 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-31 09:50:24 +00:00
Peter Kümmel
fb95caf883 cmake: Install under Windows into folder 'Resources' 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34509 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-26 09:49:06 +00:00
Peter Kümmel
38628558a6 cmake: more merged build fixes 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34274 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-23 09:10:35 +00:00
Peter Kümmel
4a37097d78 cmake has its own merged build 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34273 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-23 08:13:48 +00:00
Peter Kümmel
87c6a4679a at least compile with msvc10. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34258 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 11:19:49 +00:00
Kornel Benko
2e1e1de8d0 Missing definition of PACKAGE_STRING 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34070 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-07 12:30:43 +00:00
Uwe Stöhr
0ad3abd534 cmake/build.bat: update file as example 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33999 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-01 00:38:41 +00:00
Peter Kümmel
ff12bc6990 cmake: simplify cmake-gui usage for GNUWIN32 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33887 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-28 12:18:03 +00:00
Peter Kümmel
15f850609c cmake: update Readme 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33869 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-25 21:37:42 +00:00
Kornel Benko
a97b5c423b Find hunspell on 64-bit OpenSuSE 11 too 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33760 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-16 07:37:22 +00:00
Peter Kümmel
5ab7d85a89 cmake: extend search path for enchant 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33728 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-12 21:33:23 +00:00
Peter Kümmel
257dce79d9 cmake: fix merge build 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33661 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-07 11:28:57 +00:00
Peter Kümmel
d58b4ead47 fix bug 6578, use tabs 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33627 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-05 18:07:05 +00:00
Kornel Benko
5558074452 Added glibc debug options to cmake 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33603 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-01 11:06:13 +00:00
Abdelrazak Younes
656caf4078 Fix Windows/cmake build. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33546 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-02-23 21:15:22 +00:00
Enrico Forestieri
d472d8ddc0 Win95 is not supported by a long time now. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33527 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-02-21 18:38:17 +00:00
Peter Kümmel
3f379915a6 CMake: fix merged build, seems GCC could not handle the namespaces correctly 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33272 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-30 11:34:28 +00:00
Kornel Benko
686cd4e3a5 Remove moc-files from the set of source files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33228 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-26 12:40:51 +00:00
Kornel Benko
e2c93c5f74 Added enchant to cmake 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33167 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-01-22 18:40:49 +00:00
Peter Kümmel
35b4231eb3 remove boost warning noise 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32613 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-12-22 11:10:45 +00:00
Peter Kümmel
3dcec5edff add forgotten macro to enable pchs 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32595 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-12-19 20:18:46 +00:00
Peter Kümmel
c79d092953 too small for pchs 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32306 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-12-03 22:22:27 +00:00
Peter Kümmel
acdd652e12 cmake: add pch for gcc, it's sooo hairy, disable by default 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32305 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-12-03 22:08:08 +00:00
Peter Kümmel
075f191ff5 cmake: patch file from cmakes bug tracker 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32304 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-12-03 21:59:24 +00:00
Peter Kümmel
fbd326a0a0 cmake: add pch for gcc, it's sooo hairy, disable by default 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32303 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-12-03 21:58:44 +00:00
Peter Kümmel
651631e812 cmake: add option to suppress install make rules 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31887 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-11-07 11:19:57 +00:00