anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 14:29:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
28,343 Commits 31 Branches 172 Tags 630 MiB
1dfac5ccaa
Commit Graph

102 Commits

Author SHA1 Message Date
Vincent van Ravesteijn
1dfac5ccaa CMake: Fix the path to gettext-tools. The deps20 folder was already included in GNUWIN32. Besides, the construction with the hints variable did not seem to work. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39491 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-08-19 14:05:51 +00:00
Vincent van Ravesteijn
9ade016a90 CMake: Add the same path hint for ICONV_DLL as for ICONV_DLL_HELP. Without this hint, the former could not be found while the latter could. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39490 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-08-19 14:04:51 +00:00
Peter Kümmel
f8c077adfc cmake: create .bat with cmake command and options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39261 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-07-08 21:30:13 +00:00
Peter Kümmel
62ee3c8291 cmake: create shell script with used options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39260 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-07-08 20:53:59 +00:00
Kornel Benko
20d3484075 Compile fix for Qt 4.5 and earlier. 
Update for cmake build.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38996 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-06-08 20:22:27 +00:00
Kornel Benko
f2e437f6b8 Prepare cmake-build for debian multiarch implementation 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38830 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-24 06:58:40 +00:00
Kornel Benko
91a5a3360b Zlib search adapted for ubuntu 11.4, 64 bit 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38825 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-23 16:51:58 +00:00
Peter Kümmel
445713eae8 cmake: fix option listing 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38766 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-15 13:37:18 +00:00
Peter Kümmel
145680fcf2 cmake: more logs for intl support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38751 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-14 09:26:47 +00:00
Peter Kümmel
85733c6f6e cmake: more logs for intl support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38750 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-14 09:22:35 +00:00
Peter Kümmel
9906953921 cmake on mac: precompiled libintl comes from ports, then also use iconv from ports, this is necessary to fix linker errors and removes the cmake warning 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38731 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-12 21:48:11 +00:00
Peter Kümmel
842f0d3d44 cmake: -Dhelp=1 lists all options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38696 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-10 20:25:31 +00:00
Kornel Benko
d096463859 New cmake build from top source dir 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38608 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-05-07 10:38:22 +00:00
Peter Kümmel
d4586ba28e find gettext tools 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38087 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-03-27 23:35:13 +00:00
Peter Kümmel
25274723b0 cmake: fix wrong install path 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37925 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-03-14 23:26:00 +00:00
Peter Kümmel
715d9784f1 cmake: don't add lyx.rc as info file 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37776 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-23 18:53:56 +00:00
Joost Verburg
6db49535bf Do not set all CMake files as C header files. This fixes resource compilation. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37702 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-16 20:51:40 +00:00
Peter Kümmel
ef1444b8df cmake: complete renaming of LYX_3RDPARTY_DOWNLOAD 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37675 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-15 09:46:14 +00:00
Peter Kümmel
898eaf4ac7 cmake: give a hint that it is possible to download 3rd party libs 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37658 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-02-14 19:26:33 +00:00
Peter Kümmel
da246c7e44 cmake: don't show outdated build options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37291 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-22 09:27:06 +00:00
Peter Kümmel
51558fbf23 cmake: we have 2011 and more white space changes, won't call it "use tabs" ;) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37175 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-10 23:28:52 +00:00
Peter Kümmel
707eeb22fb cmake: we have 2011 and more white space changes, won't call "use tabs" ;) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37174 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-10 23:24:00 +00:00
Peter Kümmel
cdb3b00033 cmake: cmake is really a strange macro language 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37173 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-10 23:01:13 +00:00
Peter Kümmel
715b9e92bd cmake: make the merged build much more usable by adding all the source files to the IDE 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37169 a592a061-630c-0410-9148-cb99ea01b6c8
 2011-01-10 22:47:58 +00:00
Pavel Sanda
8f5acc63c4 Replay r36746 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36755 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-07 00:13:16 +00:00
Pavel Sanda
c68d754a74 Revert commits from 36745 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36749 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-07 00:05:40 +00:00
Peter Kümmel
56e0cfd582 cmake: add option to rebuild merged files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36746 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-12-06 20:55:05 +00:00
Kornel Benko
b308435f04 Mark created moc-files as GENERATED 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35576 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-08 06:00:10 +00:00
Peter Kümmel
8ea2da4c3c cmake: disbale CPACK by default, it triggers too much requirements 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34979 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 20:47:59 +00:00
Peter Kümmel
23cfb00ef1 cmake: more cleanup 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34964 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 07:38:00 +00:00
Peter Kümmel
9060f01aa8 cmake: split out FindHunspell.cmake 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34961 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 06:47:01 +00:00
Peter Kümmel
19c3bff281 cmake: linux fixes 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34956 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 23:12:50 +00:00
Peter Kümmel
f151f3a30f cmake: sync with branch 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34953 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 22:24:08 +00:00
Kornel Benko
29bb9c9b57 Remove second call tm msgmerge' The diffs in created po-files 
were because of the sort-flag in for msgmerge.

Now the outcome is identical to automake.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34934 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 12:58:34 +00:00
Kornel Benko
043ff28a99 Modified FindLyXGettext.cmake as to producing the same output as automake 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34932 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 12:37:37 +00:00
Peter Kümmel
56a7a67783 add first version of .lyx file encryption. It's disabled by default and could out-of-the-box only by compiled on Linux with cmake and with openssl-devel packeges. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34931 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 12:26:11 +00:00
Peter Kümmel
07eef68a90 cmake: only set and show compiler relevant options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34803 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-07 22:26:36 +00:00
Peter Kümmel
2b99cacec9 cmake: more option cleanup, use LYX_OPTION macro for consistent messages and variable naming 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34790 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-06 19:47:16 +00:00
Peter Kümmel
5f2de40786 cmake: also install locale into the resource dir on windows 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34579 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-01 13:32:10 +00:00
Peter Kümmel
ff12bc6990 cmake: simplify cmake-gui usage for GNUWIN32 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33887 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-03-28 12:18:03 +00:00
Peter Kümmel
075f191ff5 cmake: patch file from cmakes bug tracker 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32304 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-12-03 21:59:24 +00:00
Peter Kümmel
fbd326a0a0 cmake: add pch for gcc, it's sooo hairy, disable by default 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32303 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-12-03 21:58:44 +00:00
Vincent van Ravesteijn
8326148f69 Fix CMake for r31189. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31204 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-08-22 17:37:56 +00:00
Kornel Benko
a8169a0139 Use cmake macro find_package_handle_standard_args() 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29416 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-04-26 18:33:09 +00:00
Kornel Benko
1b0d8fd5f1 Added support for Aiksaurus-build 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29399 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-04-25 13:43:52 +00:00
Kornel Benko
ced1b3530b Added libmythes to lyx-build 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29334 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-04-19 15:04:20 +00:00
Kornel Benko
517f8dc1d0 Fix error in creating moc-files due to last commit. 
Again: prepend moc_ instead of appending _moc in cmake


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29258 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-04-16 10:48:32 +00:00
Kornel Benko
5378f44032 1.) some white spaces removed 
2.) Using direct call to uic-qt4. This was needed to enable translated
    strings to appear in many dialogs.
    I needed some time to find out, why strings form autocof-build made
    it into the dialogs, but strings from cmake-build did not.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29234 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-04-12 15:01:08 +00:00
Peter Kümmel
1fe1080cf6 cmake: Kornel's package versions 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28396 a592a061-630c-0410-9148-cb99ea01b6c8
 2009-02-08 12:20:31 +00:00
Peter Kümmel
510c918c6c Kornel's cmake install changes: 
New files:
        Directories:
		development/cmake/po
		development/cmake/man
        Files:
		development/cmake/po/CMakeLists.txt
			Creates lyx.pot and *.gmo-files;
			Installs ${_lang} as ${LYX_ABS_INSTALLED_DATADIR}/${LYX_LOCALEDIR}/${_lang}/LC_MESSAGES/lyx.mo
		development/cmake/man/CMakeLists.txt
			Handling of lyx-manuals.
		development/cmake/modules/FindLyXGettext.cmake
			Original: (GNU) FindGettext.cmake
			Changed the installation subdirectory of .gmo-files.
			Previously installing into "/usr/local/share/lyx2.0" led
				   to e.g. /usr/local/share/lyx2.0/share/locale/de/LC_MESSAGES/lyx.mo
				   now     /usr/local/share/lyx2.0/locale/de/LC_MESSAGES/lyx.mo
Changes:
        development/cmake/Install.cmake
                macro lyx_install _parent_src_dir
                        searches now through directories specified as simple regular expression.
                        Until now we had to specify explicitly each directory for each language.
                Mode of the DESTINATION/lyx2lyx is now corect
                Installation of the .gmo files

	development/cmake/config.h.cmake:
		Changed some #cmakedefine to #define, because config_file() did not
        	substitute the desired values in config.h.
        	Some typos corrected (TOP_SRCDIR -> TOP_SRC_DIR)

        development/cmake/configCompiler.h.cmake
                Removed doubly defined ENABLE_NLS, HAVE_LC_MESSAGES
                Installation directory still hardcoded, users need to to set environment
                variable LYX_LOCALEDIR to get the corect translations.

	development/cmake/CMakeLists.txt
		Setting correct values to LYX_ABS_INSTALLED_DATADIR,
        		LYX_ABS_INSTALLED_LOCALEDIR, LYX_ABS_TOP_SRCDIR.
			Now the lyx-executable searches on the installed places for it's data,
        		so no need to set environment anymore.
		New variable: LYX_LOCALEDIR. We need it later in FindLyXGettext.cmake,
		    	because we cannot use the absolute path LYX_ABS_INSTALLED_LOCALEDIR.
			(We need relative path when packaging to different root-directory).
                Use of module FindLyXGettext.cmake: This is a modified version
		       	of (GNU) FindGettext.cmake
                Include the new development/cmake/po directory
		Include the new development/cmake/man directory

        development/cmake/po/CMakeLists.txt
                Creation of lyx.pot and apropriate .gmo files
                Creating lyx.pot file
                        I had to use perl to simulate the unix "cat" command. Maybe Jose can
                        write the corect statement in python





git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27973 a592a061-630c-0410-9148-cb99ea01b6c8
 2008-12-28 13:35:29 +00:00