Commit Graph

463 Commits

Author SHA1 Message Date
Stephan Witt
6410fc9870 correct quote placement to avoid the „Syntax Warning“ of cmake 2014-01-09 11:48:38 +01:00
Kornel Benko
3650ed7a9d Cmake build: Make it compilable again (Add check for HAVE_UNSETENV) 2013-02-17 11:47:23 +01:00
Jean-Marc Lasgouttes
d2ea4aaebb 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-15 18:23:48 +01:00
Kornel Benko
cd9b507f5c Cmake build: Missing include path due to change of PreviewLoader.cpp
in previous commit
2012-12-13 09:12:40 +01:00
Kornel Benko
049f955110 Creating package missed the patch-version number 2012-07-17 11:19:22 +02:00
Uwe Stöhr
b1bb04d244 cmake/build.bat: update the script to Git and use Peter's suggestions 2012-03-16 02:19:49 +01:00
Kornel Benko
729fa7c253 Do not py-compile also on cmake build, backport r40648 2012-03-15 17:24:07 +01:00
Peter Kümmel
29df149f5f fix the alien build system
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40396 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-06 19:50:59 +00:00
Uwe Stöhr
58e828b0cd tex2lyx/CMakeLists.txt: revert part of r40384 that should not have gone in
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40385 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-05 21:27:05 +00:00
Uwe Stöhr
efd3ef88bb tex2lyx/CMakeLists.txt: backport r40375 and add missing file dependency
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40384 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-05 21:16:10 +00:00
Georg Baum
159875f201 Mass backport tex2lyx bug fixes.
tex2lyx is no identical with the version in trunk (except for cosmetic changes
and file formats > 413).
The output of the test cases is either unchanged or improved.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40364 a592a061-630c-0410-9148-cb99ea01b6c8
2011-12-04 16:16:32 +00:00
Kornel Benko
953d97afc0 Backport cmake-build for using framework AppKit instead of Carbon on Apple
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40323 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-30 11:46:14 +00:00
Peter Kümmel
6c79c67a8f find gettext
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40286 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-26 10:04:32 +00:00
Peter Kümmel
d753ddb058 update adrress for msvc deps
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40285 a592a061-630c-0410-9148-cb99ea01b6c8
2011-11-26 10:04:14 +00:00
Julien Rioux
fbdf373cda tex2lyx : More descriptive --help message and implement --version (#6827).
Also allow -h and -v command-line options, manpage update.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39887 a592a061-630c-0410-9148-cb99ea01b6c8
2011-10-19 14:53:01 +00:00
Kornel Benko
9c84ae59de Re-added Package.cpp to source ot translations
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39789 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-30 10:26:15 +00:00
Kornel Benko
3ff1455c66 Add springer to set of installed files [cmake build]
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39730 a592a061-630c-0410-9148-cb99ea01b6c8
2011-09-22 09:45:28 +00:00
Kornel Benko
232ad343f5 Remove CMAKE_EXE_LINKER_FLAGS from cache
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39500 a592a061-630c-0410-9148-cb99ea01b6c8
2011-08-20 06:20:52 +00:00
Kornel Benko
cf45962d76 Backport r38830, debian multiarch handling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38833 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-24 19:18:12 +00:00
Kornel Benko
902c932674 Backport r38791, Replace a perl-script with the python version
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38832 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-24 18:36:27 +00:00
Kornel Benko
ee42f84c77 Gracefuly omit doc creation if no perl detected
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38788 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-19 07:48:41 +00:00
Uwe Stöhr
c8fa4b33de cmake/build.bat: this change should not have gone in r38767
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38768 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 17:17:21 +00:00
Uwe Stöhr
d7e88ea7e0 revert r38758 as discussed in http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg169087.html
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38767 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-15 17:14:31 +00:00
Uwe Stöhr
9eb6b3b8ac backport CMake efforts to branch to be able to compile LyX 2.0.x the same way as trunk
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38758 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-14 21:35:36 +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