anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-11 05:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
33,951 Commits 31 Branches 172 Tags 616 MiB
0c093a6264
Commit Graph

139 Commits

Author SHA1 Message Date
Kornel Benko
a911b1cc65 Cmake build: Define LYX_USE_CXX11 iff using c++11 extensions after commit 329eae5605. 2015-05-20 12:07:41 +02: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
371fdb8649 Cmake build: Show the found flag for use of c++11 features 2014-05-16 13:40:34 +02:00
Kornel Benko
77ee91ccfe Cmake build: Use find_package_handle_standard_args() consistently 2014-05-13 12:30:20 +02:00
Benjamin Piwowarski
4cb8a83dab Fix for clang detection in cmake 2014-04-24 17:18:56 +02:00
Vincent van Ravesteijn
3f771c96d3 Fix EOLs 2014-03-10 21:04:25 +01:00
Kornel Benko
499c5cfe57 Adapt cmake build to use c++11 features also for clang compiler 2013-12-15 11:41:28 +01:00
Kornel Benko
075d903941 Prevent build of <lang>.gmo in case of error. 
Given erroneous <lang>.po file, this yields to error on first call
to make. Nonetheless a new <lang>.gmo file is created. The following
calls to make do not get an error.
This patch prevents the <lang>.gmo creation on error.

Problem spotted by Scott.
 2013-09-10 08:00:29 +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
Kornel Benko
f697e50fd3 Cmake build: remove warnings with newer cmake 
Omit using empty defines in find_path() and find_library()
 2013-08-23 00:02:56 +02:00
Kornel Benko
b810c5744f cmake: Make really sure, also the first po-file will be 
processed, if it is not "ALL"
We cannot overwrite tha params given to a macro. Instead
use an own variable.
 2013-06-02 17:52:40 +02:00
Vincent van Ravesteijn
90610dbc0d CMake: Make sure the first po file is also processed 2013-06-02 15:32:33 +02:00
Vincent van Ravesteijn
a3c864102a CMake: Remove libintl 2013-05-30 22:10:01 +02:00
Vincent van Ravesteijn
925c35f22e Fix CMake on Windows 2013-04-25 20:18:46 +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
9af4d0fa8c Cmake build: Unfortunatelly, there are some cmake versions 
which have not error-free version of FindQt4.cmake.
We have to stick with our own (and old) module.
 2013-03-20 20:51:50 +01:00
Kornel Benko
7dbd777146 cmake build: Add check for required QT-version 4.5.0 or higher 
Since our own module does not respect the version parameter,
while the cmake provided does, also remove our FindQt4.cmake
 2013-03-20 11:39:45 +01:00
Vincent van Ravesteijn
0cd8c03d17 CMake: Put projects into subdirs 
This patch puts all projects into subfolders (at least for MSVS). In this
way, there is a better overview (especially if the number of test projects
will be increasing).
 2012-12-15 11:02:06 +01:00
Kornel Benko
7ede020a02 Cmake build: 
1.) Cleanup the use of path-variables
2.) New directory for cmake-scripts which can be called
    at build-time
 2012-11-02 13:25:04 +01:00
Kornel Benko
854b168d17 Cmake build: 
Correct dependencies for version-info also at build-time
(not only at configure time)
 2012-11-01 13:00:19 +01:00
Kornel Benko
78492b276d Cmake build: 
Use message(FATAL_ERROR ...) to indicate failed call to a cmake-script
(like "exit -1;" in sh)
 2012-10-31 10:33:02 +01:00
Kornel Benko
1b65a03c13 Cmake build: cleanup 2012-10-25 11:19:09 +02:00
Kornel Benko
d1ca207e94 Cmake build: 
Next try to create Resources.qrc on the fly.
This time using a cmake-script instead of trying to rebuild the cache
 2012-10-25 10:45:28 +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
Kornel Benko
fdc2f0c78d Cmake build: Define for 'USE_ENCHANT' already done in development/cmake/config.h.cmake 2012-10-09 22:42:06 +02:00
Kornel Benko
d67bd17b34 cmake build: Add msgfmt po-checking 2012-08-22 13:57:43 +02:00
Kornel Benko
77a31ee0f2 Check for needed magic functions before using libmagic 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40795 a592a061-630c-0410-9148-cb99ea01b6c8
 2012-02-25 13:07:17 +00:00
Kornel Benko
f5daafc02b Added libmagic to cmake build. Should to be also adapted to windows 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40791 a592a061-630c-0410-9148-cb99ea01b6c8
 2012-02-22 10:07:04 +00:00
Vincent van Ravesteijn
2ba3007e4b CMake: Simplify the fix for the path to gettext-tools. The problem was that the first " was in the wrong place. 
see r39491 and thanks Kornel.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39505 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-08-22 11:01:41 +00:00
Vincent van Ravesteijn
1dfac5ccaa CMake: Fix the path to gettext-tools. The deps20 folder was already included in GNUWIN32. Besides, the construction with the hints variable did not seem to work. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39491 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-08-19 14:05:51 +00:00
Vincent van Ravesteijn
9ade016a90 CMake: Add the same path hint for ICONV_DLL as for ICONV_DLL_HELP. Without this hint, the former could not be found while the latter could. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39490 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-08-19 14:04:51 +00: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
Kornel Benko
f2e437f6b8 Prepare cmake-build for debian multiarch implementation 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38830 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-24 06:58:40 +00:00
Kornel Benko
91a5a3360b Zlib search adapted for ubuntu 11.4, 64 bit 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38825 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-23 16:51:58 +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
145680fcf2 cmake: more logs for intl support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38751 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-14 09:26:47 +00:00
Peter Kümmel
85733c6f6e cmake: more logs for intl support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38750 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-14 09:22:35 +00:00
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
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
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