anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,967 Commits 31 Branches 172 Tags 618 MiB
e4770dd4f8
Commit Graph

159 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
Georg Baum
3c56e7c0eb Fix MSVC C++11 detection 
The old version with empty flag did not enter the loop at all, so we have to
use a workaround. Thanks Uwe for testing.
 2016-07-02 18:26:08 +02:00
Georg Baum
987dd84461 Do not use --std=c++14 for MSVC 
MSVC does not need a special flag to specify the standard. Using --std=c++14
produces a warning, but compilation succeeds, so the old code did mistakenly
choose --std=c++14 for MSVC.
 2016-07-02 12:42:04 +02:00
Georg Baum
e49d59dafc Fix std::regex detection for older gcc 
Older gcc versions (e.g. the first one which has usable std::regex: gcc 4.9)
require the --std=c++11 flag to be set. Otherwise std::regex is not made
available. Therefore we need to keep the flag in the loop.
 2016-07-02 12:39:08 +02:00
Kornel Benko
2da1c956e4 Cmake build: Check for make_unique and PATH_MAX symbols added. 2016-06-12 19:56:31 +02:00
Kornel Benko
24a7dd45dc Cmake build: Determine availability of 'std::regex' if using clang compiler 2016-06-11 12:23:33 +02:00
Kornel Benko
f792837531 Cmake build: Finetune some destination data paths on UNIX 2016-06-10 13:40:38 +02:00
Kornel Benko
9dd695b17a Cmake build: Correct some installation paths 2016-06-07 14:38:20 +02:00
Kornel Benko
06539caccb Cmake build: Refactor determination of destination paths. 2016-06-06 08:29:07 +02:00
Kornel Benko
b5c87f2963 Cmake build: Set new installation paths 
For a suffixed version (with suffix 2.3) and installation dir (/usr/local)
the new paths are:
binary -> /usr/local/bin
system-lib -> /usr/local/share/lyx2.3
fonts -> /usr/local/fonts/truetype/lyx2.3
manuals -> /usr/local/man/man1
locales -> /usr/local/share/locale
tex -> /usr/local/texmf/tex/latex/lyx2.3
 2016-06-05 22:59:13 +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
Peter Kümmel
7d2c054611 also build without gnuwin32 directory 2015-12-15 13:20:10 +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
8c3dbe19b6 Cmake build: Adapt use of c++11 for cygwin too. 
Change done according to commit 864a4db26b
 2015-09-09 14:45:55 +02:00
Kornel Benko
46d2344902 Cmake build: Adapt detection of C++11 mode to automake 2015-09-03 11:15:10 +02:00
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