anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-11 13:46:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,188 Commits 31 Branches 172 Tags 616 MiB
4a42a71119
Commit Graph

67 Commits

Author SHA1 Message Date
Kornel Benko
fa85bf9b59 Cmake build: Added check for pythons polib module 
Idea stolen from http://public.kitware.com/pipermail/cmake/2011-January/041666.html
 2016-07-24 11:20:08 +02:00
Kornel Benko
7c0eba4d75 Cmake build: Allow user defined suffix for program files 2016-06-05 16:26:59 +02:00
Kornel Benko
41447b1225 Cmake export tests: Label handling 
In collaboration with Günter Milde:
1.) Allow char ':' be part of a ctest-label
2.) Eliminate redundant label naming and directory names
    (The testnames should not repeat the directory name)
 2016-03-26 13:06:14 +01:00
Kornel Benko
4e9fe808d7 Cmake export tests: Correct some quirks 
1.) Label lyx2lyx was handled wrong (removed '2')
2.) tests were named '_lyx2lyx' instead of only 'lyx2lyx'
 2015-12-17 12:57:34 +01:00
Kornel Benko
a9764cf191 Cmake build: Initialize some variables before use. 2015-12-09 15:37:58 +01:00
Kornel Benko
cf3156d22d Cmake export tests: Create concatenated labels in the form 'export:reverted:examples:chemgreek' 2015-12-02 22:18:43 +01:00
Kornel Benko
e39025797e Cmake export tests: Remove label 'reverted' from suspended tests. 
LyXMacros.cmake: Overseen the macro 'setmarkedtestlabel()' which added it automatically
  if the test was to invert the test result.
ExportTests.cmake: Correct label handling
 2015-12-02 13:28:16 +01:00
Kornel Benko
552ca45843 Cmake tests: macro setmarkedtestlabel() worked only by chance 
We have to check the content of the variable.
 2015-11-02 21:44:38 +01:00
Kornel Benko
63976066ad avoid qt4 variable names in cmake build 2014-07-21 08:49:05 +02:00
Kornel Benko
3b14de740d Cmake build: Symplify use of linking optional libraries found via find_package 2014-06-12 19:02:29 +02:00
Kornel Benko
cc6175bc96 Cmake build: Early check for wrong combo values 2014-06-09 10:03:56 +02:00
Kornel Benko
2a0ae2e739 Cmake build: Add combo-values to the list of displayed lyx options 2014-06-07 21:00:46 +02:00
Kornel Benko
8c0e1b5c70 Cmake build: Added convenience macro LYX_COMBO 
Will be used later to allow selection between multiple alternatives.
 2014-06-07 10:45:13 +02:00
Peter Kümmel
080fca85a8 build with mingw on Windows and Linux 2014-06-07 08:06:13 +02:00
Kornel Benko
f2553ebf6c Cmake build tests: Threadsafety and test-labeling 
The tests are now more robust if ctest uses '-j' (number of threads) parameter.
a.) keytests are running in sequence and in one thread only, no other thread running
b.) tex2lyx tests are locking in respect to each other
c.) Test gets one or more labels, so that we can select
        ctest -L url
  to run tests labeled url
d.) New macro settestlabel() to add labels to a test
 2013-09-07 09:25:02 +02:00
Vincent van Ravesteijn
6f8a74791b Adjust CMake for Qt5 2013-04-23 21:45:49 +02:00
Vincent van Ravesteijn
09c2e58373 Extend and use qt4_wrap_ui 2013-04-23 21:45:39 +02:00
Kornel Benko
1b65a03c13 Cmake build: cleanup 2012-10-25 11:19:09 +02:00
Kornel Benko
d854ded56e Cmake build: 
Do not recreate Resources.qrc at build-time for WIN32.
(For some yet unknown reason it does not work)
 2012-10-24 10:24:59 +02:00
Kornel Benko
2626821ee2 Cmake build: 
Modifications needed to work also if the path to build-dir
contains spaces. (Tested on linux)
 2012-10-23 13:23:07 +02:00
Kornel Benko
e94e9e415f Cmake build: 
Recreate Resources.qrc at build-time if needed. (E.g. after `make clean')
 2012-10-21 19:16:37 +02:00
Peter Kümmel
f8c077adfc cmake: create .bat with cmake command and options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39261 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-07-08 21:30:13 +00:00
Peter Kümmel
62ee3c8291 cmake: create shell script with used options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39260 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-07-08 20:53:59 +00:00
Kornel Benko
20d3484075 Compile fix for Qt 4.5 and earlier. 
Update for cmake build.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38996 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-06-08 20:22:27 +00:00
Peter Kümmel
445713eae8 cmake: fix option listing 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38766 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-15 13:37:18 +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
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
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
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
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
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
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
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
Vincent van Ravesteijn
8326148f69 Fix CMake for r31189. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31204 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-08-22 17:37:56 +00:00
Kornel Benko
517f8dc1d0 Fix error in creating moc-files due to last commit. 
Again: prepend moc_ instead of appending _moc in cmake


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29258 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-04-16 10:48:32 +00:00
Kornel Benko
5378f44032 1.) some white spaces removed 
2.) Using direct call to uic-qt4. This was needed to enable translated
    strings to appear in many dialogs.
    I needed some time to find out, why strings form autocof-build made
    it into the dialogs, but strings from cmake-build did not.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29234 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-04-12 15:01:08 +00:00
Stefan Schimanski
72e15d95c8 * prepend moc_ instead of appending _moc in cmake 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27447 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-11-15 13:50:20 +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
Peter Kümmel
e6bb7dc281 cmake: fix indentation 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21108 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-21 22:23:19 +00:00
Peter Kümmel
0f939f0a79 add qrc file to cmake build process 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21045 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-18 19:35:38 +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
6040a5faf6 cmake cosmetics 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19869 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-28 18:30:02 +00:00
André Pönitz
848c89564f remove lyxrc dependence from support/* 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19441 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 22:37:09 +00:00
Peter Kümmel
9e8e457428 cmake: don't rebuild merges files on each cmake run, force rebuild by -Dmerge_rebuild=1 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18175 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-02 20:47:47 +00:00