Commit Graph

240 Commits

Author SHA1 Message Date
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
Kornel Benko
af029d695f Cmake build: All directory variables should contain trailing '/' 2020-04-14 13:01:17 +02:00
Kornel Benko
b280fed1b3 Cmake build: Added 3rdparty creation of dt2dv and dv2dt
Works on linux, needs testing on Windows
2020-04-09 11:46:47 +02:00
Kornel Benko
278c26b1a6 Cmake tests: Amend 353295e4
Prevent also the command-line setting of LYX_ENABLE_VALGRIND_TESTS
for the cmake versions < 3.17
2020-04-07 14:16:07 +02:00
Kornel Benko
353295e499 Cmake tests: Start preparing for tests involving valgrind 2020-04-07 12:12:29 +02:00
Kornel Benko
c84fc5b40c Cmake build: Discard (unset) some variables if not used anymore 2020-04-07 11:48:45 +02:00
Kornel Benko
e74174c57a Cmake build: Build VERSION_INFO more cmake-like
Use LIST to add entries and convert the list later to a string
2020-03-26 15:48:01 +01:00
Kornel Benko
16802a7617 Cmake build: Amend 3df9525a, extend build info in Help>About
Add also the qt-version and paths of sysdir and the lyx executable
to the  build info
2020-03-25 17:50:58 +01:00
Kornel Benko
3df9525a13 Cmake build: Extend build info in Help>About
Added list of used cmake options and info about used compiler
2020-03-25 13:48:16 +01:00
Kornel Benko
4320e505a7 Cmake build: Remove deprecated policy warning 2020-03-01 15:36:41 +01:00
Kornel Benko
f152302275 Cmake build: Remove unused option
LYX_USE_FILEDIALOG is not used since af795b80
2020-02-22 21:13:43 +01:00
Kornel Benko
cd3f11e585 Cmake build: Amend 1c097e56, correctly respect the patch-level
Handle also the case of creating from tar-file _and_ having 'git' installed
2020-02-12 12:02:36 +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
1c097e5620 Cmake config: Respect the patch-level while creating package from tar/zip-source 2020-01-17 15:27:17 +01:00
Kornel Benko
ef4d21b684 Cmake config: Amend 43b81bec
Typo, causing wrong package creation
2020-01-17 14:59:49 +01:00
Kornel Benko
43b81becc6 Cmake config: Rename some variables to match the ones used by automake
LYX_RELEASE_VERSION renamed to LYX_RELEASE_VERSION
and got the new value of
LYX_RELEASE_PATCH
from configure.ac too
2020-01-17 14:25:57 +01:00
Kornel Benko
3a29ba795d Cmake build: Select use of interprocedural optimization
New cmake-option to explicit select/deselect the IPO
2019-12-17 13:59:52 +01:00
Kornel Benko
8181c88c28 Cmake build: Copy & paste error 2019-11-29 14:47:27 +01:00
Kornel Benko
5e436ce9e5 Cmake build: Consider for cmake versions <= 3.12 while searching for python
This partially reverts d17dfe6f
2019-11-28 21:51:47 +01:00
Kornel Benko
d17dfe6fb2 Cmake build: Replace use of deprecated module PythonInterp
Use find_package(Pytnon2 ..) and find_package(Python3 ...) instead

Patch from Patrick (pdvisschere@edpnet.be)
2019-11-28 15:09:11 +01:00
Kornel Benko
c9c86b4966 Cmake build: Remove warnings about deprecated policy CMP0069
Deprecated since cmake version 3.16
(Now explicitly enable/disable interprocedural optimization
if supported and not debugging)
2019-11-09 16:56:16 +01:00
Kornel Benko
e4d30dd7f6 Cmake build: Disable interprocedural optimization if debugging 2019-07-30 15:19:56 +02:00
Kornel Benko
e69a6661a5 Cmake build: Remove overwritten option 2019-07-13 23:56:38 +02:00
Jean-Marc Lasgouttes
1f90cd3b3f Make build: amend 6f2cd26103 (allow more compilers)
Allow gcc 4.7 and 4.8, but use boost regex

Allow visual studio 2015.
2019-06-29 16:48:06 +02:00
Kornel Benko
2a37ad9cce Cmake build: Amend e485102e, For python 3 require at least 3.5 2019-06-28 09:54:38 +02:00
Kornel Benko
6f2cd26103 Cmake build:Amend 44bbd0b0 and 22f59925
44bbd0b0: Get full version of gcc
22f59925: Remove support for gcc 4.6

Also Remove support for msvc without STD_REGEX
2019-06-13 09:18:40 +02:00
Kornel Benko
79d84fad0e Cmake build: Remove debug message 2019-06-12 19:31:46 +02:00
Kornel Benko
43c9ce2d90 Amend 03eadb1a, cmake-parsing of AC_INIT line changed 2019-06-12 19:27:58 +02:00
Kornel Benko
7d021a938c Cmake build: Use interprocedural optimization if possible
With gnu compilers this adds -flto and -fno-fat-lto-objects
to compiler and linker flags.
2019-04-22 18:53:49 +02:00
Kornel Benko
016c7d6260 Amend 4028eefe: Make callstack printing useful and optional
Added the option to cmake too
2019-02-26 09:50:58 +01:00
Kornel Benko
5e287500bf Cmake build: Fix some warnings with cmake3.13
Wrong set() syntax
2019-02-05 12:27:15 +01:00
Scott Kostyshak
e9384cb8d0 Amend 23041f53: remove extra parenthesis 2018-10-27 19:16:36 -04:00
Kornel Benko
23041f53ea Amend 4459603, MSVC versions >= 1915 allow std::regex 2018-10-27 20:51:57 +02:00
Kornel Benko
4459603b61 Allow std::regex for MSVC10 2018-10-25 10:14:49 +02:00
Richard Kimberly Heck
1ae013f816 Try to make Windows use a versioned directory for the user dir.
(cherry picked from commit 802fd7932b713ee80bf384facd45f45a5ac22de4)
(cherry picked from commit 4478451ea1)
2018-09-30 13:49:30 -04: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
6343452a73 Cmake build: Disable possible warn about not known policy 2018-06-10 11:40:12 +02:00
Kornel Benko
72a2f92239 Cmake build: Simplify use of qt5 modules
According to this page:
	http://doc.qt.io/qt-5/cmake-manual.html
the way to replace use of qt5_use_modules() for module "_mod" and target "_target"
is to use
	1.) cmake_minimum_required(VERSION 3.1.0)
	2.) find_package(Qt5${_mod} CONFIG REQUIRED)
	3.) target_link_libraries(${_target} Qt5::${_mod})
The last one sets all reguired libraries, compile flags and needed includes for the ${_target}
2018-06-09 23:59:47 +02:00
Kornel Benko
d6b21e20e2 Cmake build: Adapt to compile with qt5.11
Since qt5_use_modules() is removed from QT5 (as spotted
by Jürgen Spitzmüller), we had to create own version
of this macro.
2018-06-09 16:52:15 +02:00
Kornel Benko
08afacc239 Cmake build: Adapt use of some variables
1.) Rename LYX_PATCH_VERSION to LYX_RELEASE_VERSION.
  This matches the use in automake.
2.) Don't display LYX_DATE at configure time.
  This value is evaluated later at build time
2018-06-03 09:16:55 +02:00
Kornel Benko
933502f991 Cmake mingw build: Get rid of a cmake warning regarding policy CMP0020
For explanation see the output of 'cmake --help-policy CMP0020'
2018-05-14 17:29:45 +02:00
Kornel Benko
aed458f007 Cmake tests: New test for the outliner with beamer
Test idea from Pavel Šanda
Move insets down and up, then compare with expected latex output.
2018-01-14 13:47:27 +01:00