Commit Graph

794 Commits

Author SHA1 Message Date
Jean-Marc Lasgouttes
d7e2ca377f Get rid of QPA_XCB define
Since the platform is selected at run time (e.g. xcb vs. Wayland), it
is not a good idea to decide at compile time what code is run. Another
example is on macOS, where having xcb libraries available will lead to
lauching the Xquartz whenever LyX is running.

With this patch, things are separated:
- the code is run when run-time platform is "xcb".
- the support code is compiled in when xcb header and libraries are
  available.

The cmake code is courtesy of Kornel Benko.

Fixes ticket #13086.

(cherry picked from commit 18c310a8cf)
(cherry picked from commit f1fddd86ef)
(cherry picked from commit 3bc4554e57)
(cherry picked from commit 8c14748e78)
2024-08-31 15:07:29 +02:00
Richard Kimberly Heck
701c763221 Merge branch '2.4.x' into 2.4.1-devel 2024-06-02 21:49:54 -04:00
Kornel Benko
8edc87b681 Amend(1) 5eaa03a1, Adapt to recognise AC_INIT empty buildtype 2024-05-15 12:16:59 +02:00
Kornel Benko
5eaa03a12c Cmake build: Adapt to recognise AC_INIT empty buildtype 2024-05-14 17:07:18 +02:00
Kornel Benko
d85e281973 Cmake install: Forgotten to install tabletemplates.
(cherry picked from commit d05e295ddc)
2024-04-20 19:38:17 +02:00
Kornel Benko
10ca66a7fa Cmake install: Forgotten to install tabletemplates.
(cherry picked from commit d05e295ddc)
2024-04-20 19:36:52 +02:00
P. De Visschere
00d59c17cd cmake build with qt6 (macos) did not include "plugins"
(cherry picked from commit 4d02fb7ad7)
2024-04-02 11:53:51 +02:00
Patrick de Visschere
58aca89003 Cmake build wit qt(5|6)(macos) did not include "plugins"
This makes things much simpler.

But at least with the latest macos tools (Sonoma and XCode15) a bundle
refuses to run if it 's not signed properly.

Both issues are solved with the patch included and have now been tested
with Qt5.15 and Qt6.7.

For completeness: I've checked the font-emph shortcut issue and, as
reported in the ticket mentioned, ^CmdE works with Qt5.15 but not with
Qt6.7. However the sequence ^C E does work. I don't know whether this is
intended as a workaround for this issue or was already implemented.
2024-03-23 11:28:31 +01:00
Kornel Benko
8899e4d6cc Cmake build: Amend 1b5f8f27 2024-01-13 10:49:14 +01:00
Kornel Benko
b05d59ec04 Add missed file "org.lyx.LyX.metainfo.xml" to cmake build 2023-10-09 18:05:51 +02:00
Kornel Benko
bbe84fbee5 Amend 137fd291c2 for cmake (change of AC_INIT params) 2023-07-27 07:10:32 +02:00
Stephan Witt
f88986eff5 Improved LYX_BUILD_TYPE detection for cmake - case insensitive AC_INIT processing 2023-06-19 08:02:59 +02:00
Thibaut Cuvelier
40edcfe2f1 CMake for Windows: remove the remaining lines for Qt 4. 2022-12-15 00:53:40 +01:00
Thibaut Cuvelier
23aab19b59 CMake for Windows: remove many lines hard-coding Qt 4 paths. 2022-12-15 00:52:58 +01:00
Kornel Benko
431379615e Amend(4) 580dea63: get rid of Qt4 code also in cmake build 2022-11-22 18:48:46 +01:00
Thibaut Cuvelier
4cf7a1f6d9 Reflow LyXPaths.cmake
Indentation did not match structure.
2022-11-22 04:06:02 +01:00
Kornel Benko
25ad07afb2 Amend(3) 580dea63: get rid of Qt4 code also in cmake build 2022-11-21 09:44:36 +01:00
Kornel Benko
43d506b104 Amend(2) 580dea63: get rid of Qt4 code also in cmake build 2022-11-21 09:31:48 +01:00
Kornel Benko
580dea638d Amend ac248e39, get rid of Qt4 code also in cmake build 2022-11-19 15:50:11 -05:00
Kornel Benko
ebe4834684 Disable use of QPA_XCB if using QT6 2022-09-17 14:14:41 +02:00
Kornel Benko
7f32b02306 Amend 95da2707 for Cmake: Check for icon aliases 2022-07-13 09:36:45 +02:00
Kornel Benko
02a3705496 Amend 635a7d77: Allow compiling with Qt6 with cmake
Thanks Scott for checking.
TODO: Check compilation on Windows and Mac.
2021-03-22 16:19:10 +01:00
Kornel Benko
f3365a8fa9 Cmake debian packaging: use correct section (instead of "devel") 2021-03-14 10:17:58 +01:00
Juergen Spitzmueller
11b7714fc1 Use SVG icons in itemize bullet selector
This scales much better than the current png solution, is HiDPI- and
darkmode-ready
2021-02-09 10:32:16 +01:00
Kornel Benko
a86864b3bb Amend f7ed7f53: Cmake + epub: Install saxon*.jar together with its licence
Thanks to Pavel
2021-02-07 16:23:46 +01:00
Kornel Benko
f7ed7f53c4 Cmake + epub: Install needed docbook files 2021-02-07 12:37:58 +01:00
Kornel Benko
53084dbfd8 CMake: in Hunspell ABI check only link if external
(Thanks Scott for the patch and comment)

For the HAVE_HUNSPELL_CXXABI check, only test a (real) link command
if an external libhunspell is used or if macOS is used (see
350a9daf). If the bundled libhunspell is used, it has not been built
yet at the point of the initial cmake command.

This commit fixes an issue when the bundled Hunspell is desired.
Before, the test command would still attempt to link to the system
hunspell library. Even if the system library is available, there
could be problems if there is a mismatch of the CXX ABI. And
finally, even if the system library is available and there is no
mismatch, compiling the test file with Clang and -stdlib=libc++
seems to cause a failure when linking with the system Hunspell
library.
2021-01-20 09:39:03 +01:00
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
Yuriy Skalko
f3ec89cfa1 Always use std::regex
Since now minimum supported GCC is 4.9.
2020-11-27 12:39:59 +02: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
Scott Kostyshak
fe1cbc06c3 CMake deb: support "python2 | python3" dependency
The latest debian-based distributions have moved away from
the "python" package dependency to "python2" and "python3".
2020-10-20 13:04:41 -04:00
Scott Kostyshak
334552ade5 CMake deb: update python2 requirement
Synchronize with README: >= 2.7.
2020-10-19 15:08:31 -04:00
Yuriy Skalko
e3bf51a4c3 Revert "Enable to build with MinGW-W64"
This reverts commit ae5a8de6ea.
2020-10-16 08:17:12 +03:00
Yuriy Skalko
ae5a8de6ea Enable to build with MinGW-W64 2020-10-16 08:04:05 +03:00
Kornel Benko
932321a083 Cmake build: Install missed script listerrors 2020-10-03 14:06:24 +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
Stephan Witt
102e9297d7 Add lilypond wrapper scripts to cmake install 2020-08-30 15:39:05 +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
Kornel Benko
41e03d9b2b Cmake build: Install lyx.svg under images for all platforms 2020-08-26 14:33:42 +02:00