Commit Graph

281 Commits

Author SHA1 Message Date
Scott Kostyshak
e90abb2b06 Whitespace 2022-12-16 15:40:59 -05:00
Eugene Chornyi
26a3a08511 fix issue with zlib linkage error when using Qt6
Remove QtZlib include folder from targets
2022-12-16 21:16:05 +01:00
Kornel Benko
84ac2e51ae Cmake: warn when using stdlib-debug with Qt6 2022-12-07 11:04:55 +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
c26db650a1 Cmake build: Fix the invalid test for '-Wno-deprecated-copy' flag
The original test was always successfull, even if the flag was invalid.
But checking for '-Wdeprecated-copy' instead yields to error if the warning does not exist.
Existent warning for 'deprecated-copy' implies that 'no-deprecated-copy' also exist.
2021-09-29 17:53:50 +02:00
Kornel Benko
4f46c22d03 Cmake build: Unify use of sanitizer
The configuration variable is LYX_DEBUG_SANITIZE
which can have following values:
"NONE"
"ADDRESS" Use address sanitizer (previously used with the variable LYX_ASAN)
"UNSPECIFIED" Use unspecified sanitizer
2021-09-21 11:27:13 +02:00
Eugene Chornyi
0cbc55805b Amend 635a7d77: define /Zc flag also with QT6 2021-05-24 20:32:26 +02:00
Kornel Benko
fa704d50f7 Cmake build: Omit use -f '-Wno-deprecated-copy' on compilers which do not support this flag.
Patch from P. De Visschere

Citing Patrick: As is stands the patch unsets the test-variable
from the cache and the test is performed for each cmake-run.
Otherwise after running cmake once the check is never run again, until
one throws away the cmakecache.txt, which I try to avoid.
I suppose that after time this check will be forgotten and if the issue
is solved (by an upgrade of the Apple clang compiler) this will pass
unnoticed.
2021-04-05 11:14:13 +02:00
Kornel Benko
9b03680ab5 Cmake bqt6 build: Ignore missing Qt6MacExtras 2021-03-25 17:30:36 +01: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
Thibaut Cuvelier
b3e3404f06 Fix dependencies downloading on Windows. 2021-01-27 20:13:42 +01:00
Thibaut Cuvelier
adf62c3184 Fix compilation with MSVC 19. 2021-01-02 17:27:56 +01:00
Yuriy Skalko
bda4570400 Use new signal library nod instead of boost::signals2
Thanks Enrico for updating autotools files.
2020-12-13 23:11:19 +02: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
Yuriy Skalko
b4b2d01ea7 Update CMake for minimum GCC version: 4.9 2020-11-27 12:39:37 +02:00
Kornel Benko
7e5b1d09f3 Cmake tests: Save the number of ignored tests in file for later review 2020-11-27 00:51:36 +01:00
Kornel Benko
4c58315d4b Cmake build: Use the same warning flags at in automake 2020-11-26 11:04:48 +01:00
Eugene Chornyi
77f4d162a0 CMake fix but where Perl not found on Windows 2020-11-18 19:17:44 +01:00
Kornel Benko
c6e6b6de07 Cmake build: Partly revert 6f696151
1.) cmake errors on old versions with 'LIST does not recognize sub-command PREPEND'
2.) using Windows settings on non-Windows platforms is wrong
2020-11-14 12:21:48 +01:00
Thibaut Cuvelier
6f696151cf DocBook: implement European CV. 2020-11-14 05:46:36 +01:00
Kornel Benko
5680a4d3be Cmake build: Check for perl before use
(Define PERL_EXCUTABLE to be used while calling perl scripts)
2020-11-14 00:34:20 +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
Kornel Benko
6869c3adff Amend 39996524: Satisfy older cmake versions 2020-10-23 13:25:49 +02:00
Kornel Benko
3999652406 Amend d954a6b0: use cxx-standard supported by cmake 2020-10-22 18:53:53 +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
Yuriy Skalko
e3bf51a4c3 Revert "Enable to build with MinGW-W64"
This reverts commit ae5a8de6ea.
2020-10-16 08:17:12 +03:00
Yuriy Skalko
3ff79bccae Revert "Enable optimizations"
This reverts commit b4cd7e9d32.
2020-10-16 08:17:04 +03:00
Yuriy Skalko
b4cd7e9d32 Enable optimizations 2020-10-16 08:04:11 +03:00
Yuriy Skalko
ae5a8de6ea Enable to build with MinGW-W64 2020-10-16 08:04:05 +03:00
Thibaut Cuvelier
78a361778f DocBook: fix float tags (was unduly overridden).
The output was not valid for floats without title.
2020-09-19 20:43:38 +02:00
Thibaut Cuvelier
9d8ef32d13 Windows: fix in CMakeLists for warning flags.
/Wp64 was used to debug 64-bit incompatibilities. /W4 is used for warnings.

Don't enable /Wx to turn warnings into errors, as the dependencies won't build.
2020-09-02 15:06:13 +02:00
Kornel Benko
f78fac5a91 Cmake build: Set defaults for using 3rdparty sources according to build type 2020-08-09 10:42:02 +02:00
Stephan Witt
7923ac5804 Amend last changes 7d66e37eb2 and 06fa1ef332 to rename the MYTHESLIB cmake lookup again 2020-08-04 12:12:07 +02:00
Stephan Witt
06fa1ef332 Amend last change 7d66e37eb2 to rename the MYTHESLIB cmake lookup 2020-08-04 12:00:14 +02:00
Kornel Benko
5529172fa1 Cmake build: Re-enable address sanitizer
Moved code because:
1.) Setting of LYX_CXX_FLAGS only has no effect,
2.) and setting of CMAKE_CXX_FLAGS was to late.
2020-07-15 14:24:49 +02:00
Kornel Benko
b299bd9730 Cmake build: Added option to override configure.ac default
Example:
Set some defaults for release with '-DLYX_ENABLE_BUILD_TYPE=release',
even if configure.ac specifies for instance 'development'.
2020-07-14 20:06:43 +02:00
Kornel Benko
25b4229c58 Amend2 26fa3b3d: Added support for sanity checks (Option LYX_ENABLE_ASSERTIONS) 2020-07-13 13:51:44 +02:00
Kornel Benko
bdaad972cf Cmake build: Select some defaults depending on LYX_BUILD_TYPE 2020-07-13 10:53:52 +02:00
Kornel Benko
690ad94f9e Amend 26fa3b3d, Cmake build: Move interpretation of configure.ac to own function
Use of posix packaging needs to be known prior to call to determineversionandbuildtype()
(Spotted by Scott)
2020-07-13 10:17:54 +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
40e071c7cb Cmake build: Improve checks for stdlib-debug 2020-07-11 12:43:17 +02:00
Kornel Benko
5f0ca8efe4 Cmake build: Do not overwrite the cache if nothing changes.
One of possibly more places .
2020-06-17 00:26:51 +02:00
Kornel Benko
fc39c3b48b Cmake build: Prohibit use of external boost if using libstdc++ in debug mode
We are using the compiler falgs _GLIBCXX_DEBUG and _GLIBCXX_DEBUG_PEDANTIC
See https://opensource.apple.com/source/gcc/gcc-1640/libstdc++-v3/docs/html/debug.html
2020-05-27 11:35:48 +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
Kornel Benko
3f89dd0b48 Cmake build: Distinguish between PROGRAM_SUFFIX and LYX_VERSION
For instance: program suffix may be "", but lyx version is still "2.4"
2020-04-19 09:45:32 +02:00
Kornel Benko
5ec95f703c Cmake build: Prevent multiple configuration runs
Normally the sequence to compile is
1.) cmake <source> <some parameters>
2.) make

but since 'unset(var CACHE)' changed the cache, the following call to 'make'
triggered the configuration run.
2020-04-17 12:13:08 +02:00
Kornel Benko
dd154a5837 Cmake build: Fix use of LYX_ABS_INSTALLED_DATADIR
(Wrong display at configuration time. Also wrong value in created config.h)
2020-04-14 19:59:41 +02:00