Commit Graph

191 Commits

Author SHA1 Message Date
Kornel Benko
c07278a45c Cmake build: Syntax of AC_INIT() in configure.ac changed, adapted macro 2020-12-29 20:27:19 +01:00
Kornel Benko
86a10281da Cmake build: Expand for possible c++20 compilation 2020-12-28 13:13:27 +01:00
Kornel Benko
a171c651a6 Revert "Amend 3093789e for cmake build"
This reverts commit b3d43404f4.
2020-11-30 10:19:22 +01:00
Kornel Benko
b3d43404f4 Amend 3093789e for cmake build 2020-11-29 10:04:54 +01:00
Eugene Chornyi
77f4d162a0 CMake fix but where Perl not found on Windows 2020-11-18 19:17:44 +01:00
Kornel Benko
2ec243d47b Cmake build: Fine tuning
1.) If building with external iconv, remove remnants of libiconv data
  created if previousy used internal iconv
2.) Remove the variable HELP from cache to enable subsequent builds.
  (Different variable-handling on new cmake (version >= 3.18))
3.) New macro to extract cmake-known-cxx-sts features
4.) Check for CXX11-features only for a subset of possibilities
  known by the used cmake
2020-10-28 23:12:03 +01:00
Scott Kostyshak
2c1753a526 CMake: comment out c++20 for now
We currently get errors with internal boost and also from LyX code.
2020-10-23 17:13:25 -04:00
Kornel Benko
6869c3adff Amend 39996524: Satisfy older cmake versions 2020-10-23 13:25:49 +02:00
Kornel Benko
d954a6b09c Cmake build: Next try to use of '--std=c++17' for gnu compiler"
Setting CMAKE_CXX_STANDARD explicitly, so that cmake can use
correct cxx-flags
2020-10-22 13:46:29 +02:00
Kornel Benko
d3c16d0496 Revert "cmake build: Allow use of '--std=c++17' for gnu compiler"
This reverts commit a906676c89.
2020-10-22 12:04:41 +02:00
Kornel Benko
a906676c89 cmake build: Allow use of '--std=c++17' for gnu compiler 2020-10-21 18:27:23 +02:00
Kornel Benko
aadfb58374 Cmake build: Try to omit using directory names as source-files in po
Previously there are po-entries like
  #: lib/examples/Articles:0 src/TocBackend.cpp:296
  #:src/frontends/qt/GuiExternal.cpp:87
  msgid "External Material"
  msgstr ""

now:
  #: src/TocBackend.cpp:296 src/frontends/qt/GuiExternal.cpp:87
  #: lib/examples/Articles:0
  msgid "External Material"
  msgstr ""

(The string at 'lib/examples/Articles:0' proceeds also from the directory name 'lib/examples/External_Material')

This makes it easier to use some po-editors like 'linguist'
2020-09-07 21:12:22 +02:00
Kornel Benko
838853f99e Cmake build: Amend a9afdbb7 and 46fca4dc
Partly revert installing fonds in system dir, not needed after
a9afdbb7 (Personalize fonts)
2020-09-03 18:27:12 +02:00
Kornel Benko
46fca4dc1d Cmake build: Install lyx fonts in system dir too on linux
1.) Math-editor seems to use system fonts, so install it there.
2.) We use fonts from the support-dir, so install them there too.

This is something automake may take int account too.
2020-08-30 20:30:21 +02:00
Kornel Benko
0eb2589818 Cmake build: Use the fonts dir which is also expected by GuiFontLoader.cpp 2020-08-27 19:05:52 +02:00
Stephan Witt
7d66e37eb2 Adjust the name of the cmake module lookup script for MYTHESLIB to match the casing of the variable name 2020-08-04 11:49:03 +02:00
Kornel Benko
26fa3b3d9d Cmake build: Move interpretation of configure.ac to own function
Created function determineversionandbuildtype() in development/cmake/modules/LyXMacros.cmake
2020-07-12 16:27:45 +02:00
Kornel Benko
76db479c07 Cmake build: Change the destination of fonts
Select the lyx-fonts-directory such that font-config can find the dat
2020-06-11 19:06:21 +02:00
Kornel Benko
c7dbc201df Amend 9c863039: Cmake build: Adapt handling of c++ standards to new Visual C++ 2019
Apparently the use of "/std:c++20" is too new for our sources.
2020-06-04 18:01:49 +02:00
Kornel Benko
9c863039b6 Cmake build: Adapt handling of c++ standards to new Visual C++ 2019
More or less suggested by Thibaut Cuvelier's switch to Visual C++ 2019
2020-05-05 13:49:50 +02:00
Scott Kostyshak
f1694db496 CMake build: find enchant 2.x binary and lib
For example, see the Fedora file lists for the package
enchant2-devel [1] as well as the Debian Sid file lists for the
packages libenchant-2-dev [2] and enchant-2 [3]. The packages for
Ubuntu 20.04 are similar. Our autotools build has had support for
finding enchant 2.x since 71977769.

Searching for enchant-2 first is consistent with what we do for
autotools (see 1ae537c5).

This commit is related to #10986.

[1] https://www.lyx.org/trac/ticket/10986#comment:28
[2] https://packages.debian.org/sid/amd64/libenchant-2-dev/filelist
[3] https://packages.debian.org/sid/amd64/enchant-2/filelist
2020-03-13 10:07:05 -04:00
Kornel Benko
43dfd12fd7 Cmake build: Files already removed, but in 'git status' still present.
This is a try to really remove them.
2020-02-15 10:11:28 +01:00
Kornel Benko
9fdc00fe2a Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs() 2020-01-27 10:44:14 +01:00
Kornel Benko
9d0548e877 Cmake build: Try to find hunspell.hxx for linunx _and_ for OSX 2019-12-04 20:23:27 +01:00
Kornel Benko
0362ec022b Cmake build: Correct display cmake options
The change allows to display options whose string-length
is less than 10 characters.
The previous setting truncated the string to 4 chars,
which is too few for a string like e.g. "NATIVE".
2019-07-14 11:12:55 +02:00
Kornel Benko
c5fa5232bb Cmake build: Removed some cmake warnings 2019-03-26 10:03:18 +01:00
Kornel Benko
5e287500bf Cmake build: Fix some warnings with cmake3.13
Wrong set() syntax
2019-02-05 12:27:15 +01:00
Stephan Witt
1bf4d7b0fc Extend Clang compiler detection to cover Apple CLang
CMake 3.0 and above recognize that Apple Clang is a different compiler than upstream Clang and so it gets a different CMAKE_CXX_COMPILER_ID.
2018-06-12 22:43:03 +02:00
Kornel Benko
12a2565b97 Cmake build: Use the same destination for lyx-tex-files as in automake 2017-07-14 11:24:20 +02:00
Kornel Benko
e23e65a973 Cmake build: Install lyx-provided fonts to where GuiFontLoader.cpp expects them 2017-07-10 13:17:29 +02:00
Kornel Benko
0f798d6675 Cmake build: Allow numbers in lyx-suffix too
That way we can use '-DLYX_SUFFIX_VALUE=123.456'
2017-04-30 17:01:31 +02:00
Kornel Benko
5d3d26b024 Cmake build: Adapt handling of mytheslib to automek behaviour
The added cmake-parameter is:
  -DLYX_EXTERNAL_MYTHES=<value>
where <value> is one of
  AUTO	(Default) Search first on system for mythes (lib and include)
  ON	Use installed only (errors if not installed)
  OFF	Compile the provided source in 3rdparty
2017-03-07 14:27:08 +01:00
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