Commit Graph

662 Commits

Author SHA1 Message Date
Kornel Benko
2ebcf38493 Cmake build: Install lyx*.desktop and lyx*.svg files in appropriate locations for unix 2014-05-09 10:04:42 +02:00
Kornel Benko
aa7dbdef37 Cmake build: Add also reference to versioned lyx.svg to the resources file 2014-05-06 17:21:13 +02:00
Benjamin Piwowarski
4cb8a83dab Fix for clang detection in cmake 2014-04-24 17:18:56 +02:00
Benjamin Piwowarski
14de3aa49b CMake install and bundling improvements (esp. OS X)
This patch improves the cmake bundling process:
- reworked bundle handling for OS X: only when installing resources are copied, otherwise
only the smallest bundle is built
- on OS X, the utility programs (tex2lyx) are now installed in the right location
- it removes some unneeded BUNDLE DESTINATION
- it provides a basic support for QT plugins inclusion
- it properly builds a disk image on OS X (only the background image is missing)
- it fixes the library paths for all executables (not only LyX)
- Use the COPYING file for cmake install license
2014-04-21 11:51:04 -04:00
Kornel Benko
1bff751639 Cmake build: Assign package name dynamically
This enables to install different lyx-versions simultaneously via
the package manager.
2014-04-19 11:09:25 +02:00
Benjamin Piwowarski
26fad1b79c Fix typo in configFunctions.h (wrong define for the header) 2014-03-13 08:28:06 +01:00
Vincent van Ravesteijn
3f771c96d3 Fix EOLs 2014-03-10 21:04:25 +01:00
Vincent van Ravesteijn
eb219e1130 CMake: Regenerate deleted gmo files 2014-02-03 21:19:33 +01:00
Vincent van Ravesteijn
181e64c724 CMake: Put the docs projects in a subdirectory 2014-02-03 20:07:14 +01:00
Vincent van Ravesteijn
f63221aba4 CMake: Add target update-gmo
This target will update the gmo files if and only if the associated
po-file is modified. To determine whether a file is modified, 'git
status --porcelain' is used.

This follows up on commit 06782542.
2014-02-03 20:07:12 +01:00
Kornel Benko
499c5cfe57 Adapt cmake build to use c++11 features also for clang compiler 2013-12-15 11:41:28 +01:00
Scott Kostyshak
63deac73b3 Fix CMake install of examples/thesis
I should have done this in f5cf21d7.
2013-11-27 07:56:43 -05:00
Kornel Benko
805e51eff8 Implement file locking and apply to configure
Functions for file locking are added. They are used for ensuring that
for specified userdir only one LyX process runs configure.
2013-11-20 19:40:32 +01:00
Raphael Kubo da Costa
ca7214b410 Remove FreeBSD checks when defining USE_WCHAR_T.
The problems the comments in the build systems refer to seem to have been
fixed for years. [1] says the checks in libstdc++ have been improved, and
all supported FreeBSD versions enable wchar_t support unconditionally in
libstdc++. Additionally, this needlessly impacts FreeBSD when libc++ is used
instead of libstdc++.

[1] http://gcc.gnu.org/onlinedocs/libstdc++/faq.html#faq.freebsd_wchar
2013-10-18 03:07:30 +02:00
Kornel Benko
075d903941 Prevent build of <lang>.gmo in case of error.
Given erroneous <lang>.po file, this yields to error on first call
to make. Nonetheless a new <lang>.gmo file is created. The following
calls to make do not get an error.
This patch prevents the <lang>.gmo creation on error.

Problem spotted by Scott.
2013-09-10 08:00:29 +02:00
Kornel Benko
f2553ebf6c Cmake build tests: Threadsafety and test-labeling
The tests are now more robust if ctest uses '-j' (number of threads) parameter.
a.) keytests are running in sequence and in one thread only, no other thread running
b.) tex2lyx tests are locking in respect to each other
c.) Test gets one or more labels, so that we can select
        ctest -L url
  to run tests labeled url
d.) New macro settestlabel() to add labels to a test
2013-09-07 09:25:02 +02:00
Kornel Benko
0a779e9543 Cmake build: Move default for man-pages to /usr/local/man
and at the same time make it configurable.
Until now it was hard wired to a subdirectory of installed lyx.
2013-09-06 14:56:31 +02:00
Kornel Benko
f697e50fd3 Cmake build: remove warnings with newer cmake
Omit using empty defines in find_path() and find_library()
2013-08-23 00:02:56 +02:00
Kornel Benko
e1a442509d Cmake build: install moved springer files
The spriger directory moved from templates to examples,
but the installation of them was forgotten.
2013-08-11 21:22:00 +02:00
Kornel Benko
b810c5744f cmake: Make really sure, also the first po-file will be
processed, if it is not "ALL"
We cannot overwrite tha params given to a macro. Instead
use an own variable.
2013-06-02 17:52:40 +02:00
Vincent van Ravesteijn
90610dbc0d CMake: Make sure the first po file is also processed 2013-06-02 15:32:33 +02:00
Vincent van Ravesteijn
a3c864102a CMake: Remove libintl 2013-05-30 22:10:01 +02:00
Vincent van Ravesteijn
4738ba0f1a qt5: Fix use of zlib using config.h 2013-05-14 17:34:53 +02:00
Vincent van Ravesteijn
1ede4a51d3 CPack: Do not use CPACK_SET_DESTDIR on Windows 2013-04-25 21:18:41 +02:00
Vincent van Ravesteijn
925c35f22e Fix CMake on Windows 2013-04-25 20:18:46 +02:00
Vincent van Ravesteijn
6f8a74791b Adjust CMake for Qt5 2013-04-23 21:45:49 +02:00
Vincent van Ravesteijn
09c2e58373 Extend and use qt4_wrap_ui 2013-04-23 21:45:39 +02:00
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
Peter Kümmel
668ef9c365 cmake: build and install lyx by calling one batch script
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39879 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-17 20:42:02 +00:00
Vincent van Ravesteijn
2ba3007e4b CMake: Simplify the fix for the path to gettext-tools. The problem was that the first " was in the wrong place.
see r39491 and thanks Kornel.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39505 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-22 11:01:41 +00:00
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
Kornel Benko
90f3c110c7 Added springer and attic templates-subdirectories to install
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39274 a592a061-630c-0410-9148-cb99ea01b6c8
2011-07-10 20:49:04 +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
6c23b48fec LFUNs.lyx was erroneously installed as "doc/LFUNs.lyx/LFUNs.lyx" instead
as "doc/LFUNs.lyx"


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39244 a592a061-630c-0410-9148-cb99ea01b6c8
2011-07-04 18:27:50 +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
Peter Kümmel
afad4dc1ea cmake: more to do
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38952 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-05 10:37:42 +00:00
Kornel Benko
b9f6d8999c Added also dependency on python to debian packaging
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38882 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-29 13:19:41 +00:00
Kornel Benko
e1d17fd599 Generate package dependences for debian
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38881 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-29 12:20:23 +00:00
Kornel Benko
12cecb196d Some more patterns for files which should not be included in source tar
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38836 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-25 15:22:00 +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
Kornel Benko
4e67cdb038 Typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38824 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-23 10:40:50 +00:00
Kornel Benko
4ed0b6cd53 Creat source package with 'make package_source' from inside the build directory
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38823 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-23 08:44:32 +00:00
Kornel Benko
6551ff4a39 Creation of LFUNs.lyx added
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38812 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-22 12:45:12 +00:00
Kornel Benko
b0716b0f13 Cpack variables and package creation transfered to LyxPackaging.cmake
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38808 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-22 09:33:53 +00:00
Peter Kümmel
1924463981 cmake: update TODO list, move svnrvison code, remove duplicated code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38806 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-22 08:18:54 +00:00
Kornel Benko
9190519e98 1.) Run in place feature: If everything fails, try with source path
2.) Read the PATCH_VERSION from configure.ac too
3.) Ident-text in script


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38804 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-21 13:48:45 +00:00
Peter Kümmel
883c7d7be9 master cmakefile "What a mess!"
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38803 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-21 12:26:05 +00:00
Kornel Benko
cf52bab933 Remove the need for perl if creating doc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38791 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-20 06:40:04 +00:00
Pavel Sanda
0000ab321a * cmake/TODO.txt
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38773 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 20:56:22 +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
41a0adcb47 cmake: build a .dmg file on Mac, looks not as nice as the official installer but it runs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38765 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 13:21:18 +00:00
Peter Kümmel
fd056f8117 cmake: update todo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38764 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 11:24:40 +00:00
Peter Kümmel
e95c2f1457 cmake: update todo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38763 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 09:40:04 +00:00
Peter Kümmel
11a76e24f8 cmake: add TODO list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38762 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 09:19:00 +00:00
Peter Kümmel
09a756d79a cmake: move intl config file into source
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38755 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-14 12:54:43 +00:00
Peter Kümmel
4139a5e90c cmake: remove mac warnings when building intl
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38754 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-14 12:49:26 +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
Kornel Benko
583627bfb4 Added missing cmakedefines to intl
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38724 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-12 17:12:08 +00:00
Peter Kümmel
e6ad9489cf cmake: we already test on gettext
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38716 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-12 04:22:14 +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
Peter Kümmel
ce4cdf2258 cmake: enable in-source CMakeLists.txt files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38692 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 18:04:49 +00:00
Kornel Benko
de46406e8d Moved development/cmake/CMakeLists.txt into top level
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38678 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-09 21:54:31 +00:00
Kornel Benko
1d23f8bf79 While using internal libintl, make sure it is uptodate before linking lyx
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38631 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-08 09:19:12 +00:00
Kornel Benko
2ff1181e52 Make installed python scripts executable (as in autotools)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38627 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-08 07:28:19 +00:00
Peter Kümmel
fc5060a5e6 fix win32 linker errors
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38614 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-07 13:01:30 +00:00
Peter Kümmel
0ba6efb073 cmake: CMAKE_SOURCE_DIR has changed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38612 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-07 11:55:06 +00:00
Peter Kümmel
f81f512390 cmake: remove obsolete comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38610 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-07 11:34:22 +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
Kornel Benko
45b61c6ecf 1.) Corrected internal compilation for Libintl
2.) Changed cmake-files accordingly
Patch from Jean-Marc Lasgouttes


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38606 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-06 19:24:54 +00:00
Kornel Benko
d03d3e2461 Make it buildable on linux again. (LYX_DATA_SUBDIR is on non-windows defined as '').
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38483 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-23 14:15:32 +00:00
Peter Kümmel
659d68713f cmake: fix wrong installation path of 'layouttranslations' (the already existing file in lib/)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38474 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-22 12:53:48 +00:00
Kornel Benko
6940947790 Remove layouttranslations from automatic build.
To create it, one has to go into the po-build-directory and call
'make layouttranslations1'


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38372 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-14 09:01:27 +00:00
Kornel Benko
93f42a3f67 Omiting dependecy recursion for po/layouttranslations in cmake build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38252 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-05 07:07:20 +00:00
Kornel Benko
4744d2e123 Restore classic in cmake build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38224 a592a061-630c-0410-9148-cb99ea01b6c8
2011-04-03 08:16:36 +00:00
Kornel Benko
428c425a51 Added layouttranslations handling to cmake build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38174 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-31 07:59:33 +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
ce7fee0333 cmake: find downloaded python
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38077 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-27 20:13:47 +00:00
Kornel Benko
fad3b780e6 Do install only really wanted files in scripts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38045 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 13:51:59 +00:00
Kornel Benko
ec36884e80 Add oxygen and liber icons to cmake build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38042 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-25 06:35:27 +00:00
Joost Verburg
318206c4b5 also install R scripts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38036 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 23:17:21 +00:00
Joost Verburg
06a45f16a7 install thesis template
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38032 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-24 22:02:21 +00:00
Peter Kümmel
142774716c cmake: install prefix is a path
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37926 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-14 23:26:28 +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
4620034eda Fix crash when using msvc10's regex, seems boost's regex couldn't replaced by msvc's in ECMAScrip mode.
Solution: use boost also for msvc10

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37832 a592a061-630c-0410-9148-cb99ea01b6c8
2011-03-02 21:28:36 +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
Joost Verburg
6f765737f8 update for new MSVC 2010 dependencies package lyx20-deps-msvc2010-x86.zip (all dependencies in one zip)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37670 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-14 22:04:58 +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
58d9848d93 cmake: fix merged build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37596 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-11 02:20:23 +00:00
Peter Kümmel
69fc2ddac4 cmake: support source packaging
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37590 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 22:44:59 +00:00
Kornel Benko
4a8698c808 Define LYX_(MAJOR|MINOR)_VERSION also for cmake build
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37580 a592a061-630c-0410-9148-cb99ea01b6c8
2011-02-10 06:16:12 +00:00
Peter Kümmel
40dcf20b5d cmake: add option to download msvc 10 3rd party libraries
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37370 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-30 10:23:29 +00:00
Peter Kümmel
8f8aab094d cmake: also add gifs to resources
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37317 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-24 11:50:13 +00:00
Stephan Witt
2b8bdd5b34 since r37306 tex2lyx uses src/LayoutFile too
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37307 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-24 08:34:31 +00:00
Peter Kümmel
a2435792ce cmake: add ui files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37303 a592a061-630c-0410-9148-cb99ea01b6c8
2011-01-22 18:58:26 +00:00