Commit Graph

239 Commits

Author SHA1 Message Date
Peter Kümmel
2467c38ca9 cmake: fix for PyCompile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28227 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-17 19:17:51 +00:00
Peter Kümmel
42dc171666 cmake: fix for PyCompile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28226 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-17 18:54:28 +00:00
Peter Kümmel
01854608fd cmake: more fixes from Kornel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28103 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-11 20:56:40 +00:00
Peter Kümmel
fbdafecf52 cmake: more fixes from Kornel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28102 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-11 20:52:14 +00:00
Peter Kümmel
138d393a17 Kornel's patch
development/cmake/Install.cmake
		Added directory scripts
		Corrected handling of directories. There may well be empty _dir_list.
			(if we search for e.g. lib/doc/en/clipart, there is nothing)
	development/cmake/lyx2lyx/CMakeLists.txt
		most ot the code moved to development/cmake/lyx2lyx/CMakeLists.txt,
			we include now this module.
	development/cmake/CMakeLists.txt
		add the subdirectory "scripts"


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28100 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-11 18:50:24 +00:00
Peter Kümmel
ed50dbfe0f New files from Kornel
development/cmake/PyCompile.cmake
		common code for creating .pyc and .pyo files
			for scripts and lyx2lyx python files
	development/cmake/scripts/CMakeLists.txt
		sets a variable and includes development/cmake/PyCompile.cmake


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28098 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-11 18:28:48 +00:00
Peter Kümmel
588a118f3f cmake: some cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28010 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-06 18:51:00 +00:00
Peter Kümmel
18305961ed cmake: set default install path, add py-compile for lyx2lyx, from Kornel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28001 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-05 19:13:20 +00:00
Peter Kümmel
9c44e16aea cmake: explain ugly hacks
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27984 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-04 13:33:23 +00:00
Peter Kümmel
b89a2ff510 cmake: more changes from Kornel, and Windows fixes: glob is not really cross plattform
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27983 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-04 13:01:55 +00:00
Peter Kümmel
874a696dfa cmake: more changes from Kornel, and Windows fixes: glob is not really cross plattform
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27982 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-04 13:00:34 +00:00
Peter Kümmel
afe522b1f6 Kornel
New files:
        development/cmake/doc/ReplaceValues.pl
                perl-script to substitute words (defined in the cmd-line) with their actual
                        values
        development/cmake/doc/CMakefiles.txt
                convert and install files .lyx and .txt-files from the lib/doc-directory
	development/cmake/src/client/CMakeLists.txt
		create and install lyxclient
	
Changed:
        development/cmake/Install.cmake
                include the new doc-directory
                remove installation of .lyx from the doc-directory. Will be installed in
                        development/cmake/doc/CMakefiles.txt
        development/cmake/Install.cmake
                changed macro lyx_install() to not insert '.' into the globbing-expression
                        automatically. We need sometimes also dotless files.
	development/cmake/src/CMakefiles.txt
		Added subdirectory client to create and install lyxclient on unix-like systems


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27978 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-03 10:53:24 +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
Peter Kümmel
b581607b55 cmake: gettext patch from Kornel
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27931 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-20 09:25:55 +00:00
Peter Kümmel
672a158a0a cmake: more install fixes, thx to Kornel Benko
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27871 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-14 17:09:06 +00:00
Peter Kümmel
7ad91d8646 fix line endings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27836 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-10 17:29:44 +00:00
Peter Kümmel
8d50d723a0 cmake: add TODO
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27835 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-10 17:28:27 +00:00
Peter Kümmel
1327b056b1 cmake: fix gcc include
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27834 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-10 17:19:56 +00:00
Peter Kümmel
201d2b3814 cmake install: add new languages
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27832 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-09 20:31:28 +00:00
Peter Kümmel
2a0103cccd cmake: fix linux install path
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27829 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-09 20:14:59 +00:00
Peter Kümmel
ad175314c5 cmake: fix install rules
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27828 a592a061-630c-0410-9148-cb99ea01b6c8
2008-12-09 20:13:04 +00:00
Stefan Schimanski
1c02ecd41d * compile fix for cmake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27598 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 23:26:40 +00:00
Stephan Witt
aab943d87e using cmake 2.6 on mac include escape has to be changed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27532 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-16 12:23:28 +00:00
Peter Kümmel
2f6b068f1e add instructions in error case
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27491 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 20:55:19 +00:00
Stefan Schimanski
72e15d95c8 * prepend moc_ instead of appending _moc in cmake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27447 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-15 13:50:20 +00:00
Peter Kümmel
f712b9840f cmake: add endian check, thx to Jose and pdv
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26469 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-20 19:43:52 +00:00
Enrico Forestieri
bc72d3fc58 Automate setting of LYX_DIR_XXx and LYX_USERDIR_XXx environment variable names.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25898 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-26 10:45:38 +00:00
Peter Kümmel
bdde87d39f disable warning for msvc6 infected developers (scope of for(...,,) declarartions)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25455 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-05 09:50:29 +00:00
Abdelrazak Younes
4241db7c0d CMake external intl unconditionally.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25205 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-09 12:10:15 +00:00
Abdelrazak Younes
258b8a40c5 fix cmake/mac
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25195 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-08 18:45:51 +00:00
Peter Kümmel
c33b30fd84 cmake: use 2.4 behavior also for cmake 2.6
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24926 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-24 21:22:36 +00:00
Abdelrazak Younes
9fbd672b83 boost::iostreams is not used nor compiled.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24917 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-23 15:49:16 +00:00
Abdelrazak Younes
4113872d60 We don't use boost::filesystem anymore.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24909 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-23 12:07:29 +00:00
Peter Kümmel
69f1cd1e50 cmake: don't forget arg for build type
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24383 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 12:18:22 +00:00
Peter Kümmel
5844446857 external libintl: fix nls compiler error
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24382 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 12:09:56 +00:00
Peter Kümmel
07502281bc MinGW fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24381 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 11:06:08 +00:00
Peter Kümmel
f7d5c40b6c MinGW is too slow with O3
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24348 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 12:00:53 +00:00
Peter Kümmel
eb987d20db MinGW fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24346 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 10:17:40 +00:00
Peter Kümmel
eaa86aaaf7 cmake: verbose makefiles also for mingw
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24343 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 09:19:30 +00:00
Peter Kümmel
527d3ac174 cmake: skip configure checks only for msvc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24341 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 09:08:29 +00:00
Peter Kümmel
1500d274b4 cmake: use external libintl on windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24338 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-19 08:47:33 +00:00
Peter Kümmel
f6de6828ef cmake: also build with win32libs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24295 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-16 16:47:12 +00:00
Abdelrazak Younes
7650cbf9fd Fix CMake-2.6
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24258 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-15 13:57:54 +00:00
Peter Kümmel
f604b54165 build out of the box with win32libs from the kdewin installer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23924 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-24 14:19:36 +00:00
André Pönitz
976f4d891e remove unused defines QT_CLEAN_NAMESPACE and QT_GENUINE_STR
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23869 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-21 15:12:46 +00:00
José Matox
b7800ca8de fix cmake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23852 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-20 15:06:02 +00:00
Abdelrazak Younes
27de158157 Fix tex2lyx compilation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23121 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-22 09:23:47 +00:00
Stefan Schimanski
dd714bfce8 * LinkBack support files, now in pure Objective-C (without any Objective-C++ which is not supported by automake)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22761 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-03 10:41:23 +00:00
Peter Kümmel
5c90a54ac1 cmake: enable lyxserver on linux
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22382 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-05 13:12:37 +00:00
Stefan Schimanski
4d30504965 r16146@goedel: sts | 2007-12-13 22:40:01 +0100
* zlib is used by minizip


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22136 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-13 21:42:24 +00:00