anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
30,942 Commits 31 Branches 172 Tags 616 MiB
36da271b74
Commit Graph

535 Commits

Author SHA1 Message Date
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
Kornel Benko
0ea6654228 Cmake build: Creating a define for a header file found 
need now only changes in the list of header files in ConfigureChecks.cmake.
 2013-02-12 19:01:16 +01:00
Kornel Benko
88101bae75 C&P error. Sorry 2013-02-12 17:46:35 +01:00
Kornel Benko
ae04b1a18e Cmake build: Correct the previous commit. 
We have to apply configure_file() twice, therefor the new file.
 2013-02-12 17:40:32 +01:00
Kornel Benko
5970aff01a Cmake build: If checking for new function, say xyzzy, we want 
have a definition '#define HAVE_XYZZY 1'.
Now, it is sufficient to add xyzzy to list of functions in ConfigureChecks.cmake'
 2013-02-12 17:22:07 +01:00
Kornel Benko
36c5c7b9c5 Cmake build: 1.) Sort function checcking alphabetically 
2.) add definition HAVE_UNSETENV to header
 2013-02-12 15:27:39 +01:00
Jean-Marc Lasgouttes
81d863fd41 Fix bug #8537: LyX creates the environment variable LC_ALL 
The current code is not able to unset an environment variable, only to set it to an empty value. This patch refactors a bit the Message class and uses a new EnvChanger helper class that allows to change temporarily an environment variable and that is able to unset variables if needed.

The patch also adds new functions hasEnv and unsetEnv in environment.cpp.

Open issues:
 * there may be systems where unsetenv is not available and putenv("name=") does not do the right thing;
 * unsetenv may lead to leaks on some platforms.
 * when using unsetenv, we may need to remove strings from the internal map that setEnv uses.
 2013-02-12 12:14:06 +01:00
Uwe Stöhr
409f384e21 cmake/build.bat: update build script for installations 2013-01-13 20:16:06 +01:00
Kornel Benko
ab1be44b92 Cmake build: Add .tex files to the list of doc-files. 
(This adds "SpecialParagraphShape.tex", which is needed by
Additional.lyx)
 2013-01-13 15:31:23 +01:00
Kornel Benko
03abfd4c7d C&P error 2013-01-09 16:40:54 +01:00
Kornel Benko
46e51018d5 Cmake build: Correct creation of lyx_date.h because of 
not defined behaviour cmake command copy_if_different
in case, the destination is not present
 2013-01-09 16:31: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
d91d6e3343 Cmake build: 
Cleanup the use of path-variables
 2012-11-02 13:33:22 +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
Kornel Benko
2626821ee2 Cmake build: 
Modifications needed to work also if the path to build-dir
contains spaces. (Tested on linux)
 2012-10-23 13:23:07 +02:00
Kornel Benko
e94e9e415f Cmake build: 
Recreate Resources.qrc at build-time if needed. (E.g. after `make clean')
 2012-10-21 19:16:37 +02:00
Kornel Benko
419f32df91 Cmake build: 
Creating LYX_DATE dynamically at configure-time caused unwanted recompilation
of the whole directories (src + src/tex2lyx) because all the relevant objects
were dependent of a common file (flags.make in case of "Unix makefiles") which changed
accordingly.
There is now a new include (lyx_date.h, with only one definition)

Nothing changes for automake, since in this case LYX_DATE is defined in config.h
 2012-10-15 22:50:39 +02:00
Kornel Benko
24206e2c67 Cmake build: 
Partially revert 75d63ad1f2
It caused recompiling everything at each commit.
Now use definition of LYX_DATE only when compiling version.cpp
 2012-10-15 13:16:08 +02:00
Kornel Benko
20359572ed Patch from Benjamin Piwowarski 
Just some comments on the patch:

- The executable name has to match the information in Info.plist (development/MacOSX/Info.plist.in and CMakeLists.txt).  The autoconf config/lyxinclude.m4 file has been modified to make it work with autotools.

- The process to build OS X bundle is to first add all the files to be included to the bundle when calling add_executable (src/CMakeLists.txt) and then by calling setting the source file property of each of these files (development/cmake/Install.cmake, l.14) so that the files are properly located into the bundle. This is also why Install.cmake has to be included two times in src/CMakeLists.txt (once to build the list of files, once to set the location of the list of files).

- in CMakeLists.txt there is a line
install(CODE "set(BU_CHMOD_BUNDLE_ITEMS 1)")
What it does is to fix the owner permissions within the bundle - this is necessary because some libraries are copied within the bundle and might be owned by root

- An empty qt.conf is included in the bundle so that QT does not try to link to other QT libraries (which will not be included in the bundle)

- In development/cmake/Install.cmake, some OS X specific files (*.sdef, qt.conf, *.icns) have to be included in the bundle

Benjamin
 2012-10-13 09:53:20 +02:00
Kornel Benko
fdc2f0c78d Cmake build: Define for 'USE_ENCHANT' already done in development/cmake/config.h.cmake 2012-10-09 22:42:06 +02:00
Kornel Benko
8217df8a68 Cmake build: 
Handle option "LYX_DEVEL_VERSION" to add the preprocesor definition of DEVEL_VERSION
The effect should be alike the configure parameter "--enable-build-type=dev"
 2012-10-09 21:52:17 +02:00
Kornel Benko
b1a409be97 Make package name be platform dependent 2012-09-21 15:09:46 +02:00
Kornel Benko
d67bd17b34 cmake build: Add msgfmt po-checking 2012-08-22 13:57:43 +02:00
Juergen Spitzmueller
b6a63bfce8 An IPA toolbar 
Translators: sorry ;-)
 2012-08-21 14:56:34 +02:00
Uwe Stöhr
3b6bf1ee06 cmake/build.bat: correct a path proposal 2012-05-27 02:15:18 +02:00
Uwe Stöhr
eeda1c099e - INSTALL.Win32: revise and update the description because since Qt 4.8 it mustn't be compiled (and can currently also not without a lot of hacking). Moreover we have now a build script that does all the configuration in one step and we can benefit from the fast Ninja compilation 
Signed-off-by: Uwe Stöhr <uwestoehr@lyx.org>
 2012-03-18 23:59:03 +01:00
Uwe Stöhr
a4503bc1b4 cmake/build.bat: don't mention SVN anymore as it would only lead to confusion 2012-03-16 02:23:25 +01:00
Kornel Benko
35370b8aa5 fix file permissions of lib/scripts/ -files in cmake build 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40906 a592a061-630c-0410-9148-cb99ea01b6c8
 2012-03-10 14:23:33 +00:00
Kornel Benko
77a31ee0f2 Check for needed magic functions before using libmagic 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40795 a592a061-630c-0410-9148-cb99ea01b6c8
 2012-02-25 13:07:17 +00:00
Kornel Benko
f5daafc02b Added libmagic to cmake build. Should to be also adapted to windows 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40791 a592a061-630c-0410-9148-cb99ea01b6c8
 2012-02-22 10:07:04 +00:00
Uwe Stöhr
220cbe0fd8 cmake/build.bat: disable merged build be default, can be re-enabled for a final build (as suggested by Peter) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40764 a592a061-630c-0410-9148-cb99ea01b6c8
 2012-02-15 23:17:34 +00:00
Kornel Benko
28b401b40e Adapt support for distributing desktop files and icons also in cmake build 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40532 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-12-20 13:49:55 +00:00
Kornel Benko
4f03d21a94 Do not install _any_ hidden file in cmake build 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40518 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-12-18 12:56:38 +00:00
Peter Kümmel
15bf2b58aa cmake: remember path 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40399 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-12-06 20:23:26 +00:00
Peter Kümmel
0ed63f028d don't hard code private pathes 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40398 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-12-06 20:03:14 +00:00
Kornel Benko
8e396ceb1c Correct the list of needed cmake-files for building a tarball 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40395 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-12-06 13:05:05 +00:00
Kornel Benko
a5e8db71ae Install desktop file in cmake-build too 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40394 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-12-06 11:48:33 +00:00
Uwe Stöhr
b7e2e68a64 cmake/build.bat: remove unnecessary flags and add some to get a console in debug mode 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40383 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-12-05 21:13:02 +00:00
Uwe Stöhr
465166c882 cmake/build.bat: explicitly compile with the console window in debug mode 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40369 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-12-05 01:12:13 +00:00
Uwe Stöhr
ca7607fcde cmake/build.bat: make the script compilable (fix a syntax error) and add a "" pair for security reasons 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40303 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-11-28 23:50:20 +00:00
Uwe Stöhr
3f15978509 cmake/build.bat: fix a typo 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40299 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-11-28 00:46:47 +00:00
Uwe Stöhr
43939f7487 cmake/build.bat: this should not have gone in in my last commit 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40191 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-11-13 20:19:03 +00:00
Uwe Stöhr
b50f96bdfa cmake/build.bat: MSVC 2010 is required to build LyX on Windows for releaes; for install the console must be turned off; the PATH must no contain quotes 
(But even with these fixes, the script fails, see my mail.)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40190 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-11-13 20:05:08 +00:00
Peter Kümmel
bb53335350 cmake fix po generation/update: msguniq.exe doesn't like dos line endings (produces broken pot files) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39914 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-10-21 23:22:58 +00:00