anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-12 16:50:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
40,635 Commits 31 Branches 172 Tags 629 MiB
cab4302377
Commit Graph

167 Commits

Author SHA1 Message Date
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
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
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
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
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
Peter Kümmel
e6bb7dc281 cmake: fix indentation 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21108 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-21 22:23:19 +00:00
Peter Kümmel
04ba7e1bb2 rcc: use -name option 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21074 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-19 18:45:09 +00:00
Enrico Forestieri
026013e1eb Compile fix 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21065 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-19 15:16:40 +00:00
Peter Kümmel
0f939f0a79 add qrc file to cmake build process 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21045 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-10-18 19:35:38 +00:00
André Pönitz
83c9b040e7 cmake cosmetics 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19871 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-28 19:54:42 +00:00
André Pönitz
6040a5faf6 cmake cosmetics 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19869 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-28 18:30:02 +00:00
André Pönitz
b839dd33ae some attempt at cmake beautification 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19862 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-28 17:07:02 +00:00
André Pönitz
848c89564f remove lyxrc dependence from support/* 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19441 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-08-11 22:37:09 +00:00
Peter Kümmel
9e8e457428 cmake: don't rebuild merges files on each cmake run, force rebuild by -Dmerge_rebuild=1 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18175 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-05-02 20:47:47 +00:00
Peter Kümmel
49b4047bde cmake: check if iconv is part of libc 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18082 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-29 10:23:22 +00:00
Peter Kümmel
66aea64a21 cmake: simplify all-in-one file naming 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17722 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-04 19:21:16 +00:00
Peter Kümmel
afd9d1b40a cmake: remove warning about const const, don't use pchs when compiling merged 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17721 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-04-04 19:07:43 +00:00
Peter Kümmel
0edd3bf6e0 cmake: some cleanup only 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17653 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-03-30 20:29:23 +00:00
Peter Kümmel
e808e7bb4b cmake: remove obsolete file generation 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17630 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-03-29 19:25:35 +00:00
Peter Kümmel
b0cb0eaa25 cmake: overwrite allinone files on each cmake run 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17579 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-03-26 20:03:31 +00:00
Peter Kümmel
6ca10b4750 also speed up compiling touched files under Linux 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17576 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-03-26 18:03:56 +00:00
Peter Kümmel
3a74b10d91 also improve build times when working on some files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17530 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-03-24 11:33:03 +00:00
Peter Kümmel
65870c3168 final compilation: wheel was already invented :( 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17529 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-03-23 23:56:27 +00:00
Peter Kümmel
13f6fb1712 also merge qt files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17513 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-03-22 22:58:52 +00:00
Peter Kümmel
531e4b726d cmake build system: 
Add "merge" option which minimizes the number of files to build.
   only the qt4 and boost files will not merged into one file.
   This really speeds up the compilation.
   Usage:
     cmake ../trunk/development/cmake -Dmerge=1



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17495 a592a061-630c-0410-9148-cb99ea01b6c8
 2007-03-20 22:13:21 +00:00
Peter Kümmel
64aadeaf5f also work with Joost's windows file bundle (qmake gives the non-portabale path of Joost's Qt installation) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16388 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-12-23 21:47:06 +00:00
Peter Kümmel
5524f5f857 update to cmake 2.4.4 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16028 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-11-24 15:10:16 +00:00
Peter Kümmel
d3b31c4ae0 don't use dummy QT_QTMAIN_INCLUDE_DIR 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15806 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-11-08 12:26:52 +00:00
Peter Kümmel
a582b4f954 update to cmake's cvs version, fixes missing qtmain error on windows 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15805 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-11-08 12:25:00 +00:00
Peter Kümmel
2ceb5e2769 add support of precompiled headers for msvc, enable with -Dpch=1, disable headers by defining LYX_DONT_PRECOMPILE_* macros in config.C.cmake 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15505 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-10-23 13:32:46 +00:00
André Pönitz
de6418f377 use more unicode in math 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15462 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-10-22 10:15:23 +00:00
Peter Kümmel
4cc5d0825d cmake: don't forget command line options 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15403 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-10-20 12:46:30 +00:00
Peter Kümmel
4656a5e16a fix wrong line endings of generated Qt4 ui files on Windows 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15398 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-10-20 11:28:45 +00:00
Peter Kümmel
134bc3ea2c propdel svn:executable 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15055 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-18 20:46:16 +00:00
Peter Kümmel
406b997b98 add libaspell as possible name 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15047 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-18 18:28:17 +00:00
Peter Kümmel
7c9876766c add copyright notice 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15012 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-15 17:05:20 +00:00
Peter Kümmel
3a4c53e206 check PATH for iconv.dll 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14901 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-06 08:43:48 +00:00
Peter Kümmel
6ceff16584 move project_source_group macro into an extra file: ProjectSourceGroup.cmake 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14888 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-03 23:52:51 +00:00
Peter Kümmel
1fbce8c2b6 more flexible msvc project folder generation, flat is default 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14887 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-03 23:50:16 +00:00
Peter Kümmel
cf3ec5d31f search also for other names of iconv.dll 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14880 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-03 13:46:47 +00:00
Peter Kümmel
f81e924143 also work with MSYS 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14878 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-03 13:20:38 +00:00
Peter Kümmel
6611e3843b add \n 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14875 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-03 10:51:46 +00:00
Peter Kümmel
8f8f581316 also check vor env. variable GNUWIN32_DIR 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14874 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-03 10:51:20 +00:00
Peter Kümmel
55b3fd5874 also work with spaces in the path 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14873 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-03 09:10:18 +00:00
Peter Kümmel
7dc7f5b335 add -DGNUWI32_DIR=my/path/to/gnuwin32 option 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14872 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-09-03 08:48:58 +00:00
Peter Kümmel
4a14a050b4 use module to find support libraries, also search for win32libs( http://www.kdelibs.com/wiki/index.php/3rd-party_libraries_required_for_KDElibs_4 ) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14668 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-08-14 11:10:43 +00:00
Peter Kümmel
118cdb2bd3 add qt3 support 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14156 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-20 09:57:19 +00:00
Peter Kümmel
330db5cce1 correct svn properties, upadte aspell handling 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14121 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-15 15:11:25 +00:00
Peter Kümmel
7c00f14cc1 Initial cmake support. 
trunk/development/cmake/README.cmake:

Building LyX with CMake

CMake 2.4.2 or CVS version from www.cmake.org


Building Visual C++ 2005 project files:

- install Visual C++ 2005
- install Platform SDK 2005, "Core" and "Web Workshop"
- add include and library paths of the SDK to the IDE search paths,
  menu: Tools->Options->VC++ directories->Library files + Include files
- install zlib (www.zlib.net) into %ProgramFiles%/GnuWin32/include+lib
  or %ProgramFiles%/zlib/include+lib
- create a build directory, e.g. .../trunk/../build
- call in the build directory cmake ..\trunk\development\cmake
- start lyx.sln


To generate other build files call "cmake" 
which shows a list of possibilities.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14071 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-11 11:57:25 +00:00