Commit Graph

87 Commits

Author SHA1 Message Date
Kornel Benko
cd861f10c5 Use decimal representation of QT_VERSION for moc-run in cmake build to match the qglobal.h computation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38997 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-08 23:00:28 +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
d75e87b250 cmake: debug is default, show on terminal
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38951 a592a061-630c-0410-9148-cb99ea01b6c8
2011-06-05 10:37:12 +00:00
Kornel Benko
090daa2642 Omit warning on systems where dpkg-architecture does not have variable DEB_HOST_MULTIARCH
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38872 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-28 08:30:44 +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
Peter Kümmel
82741b94a0 cmake: integrate vld
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38811 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-22 11:38:10 +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
Kornel Benko
4fb3e19aa7 Hold cpack-variables together
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38807 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-22 08:38:31 +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
8759fb5f7f cmake: better cmake messages, don't overwrite CPacks default
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38802 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-21 12:17:05 +00:00
Peter Kümmel
a6a612b325 cmake: also support binary releases on Linux
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38797 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-21 10:29:41 +00:00
Peter Kümmel
a80188fec4 cmake: generate ready-to-use nsis files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38796 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-21 09:50:41 +00:00
Peter Kümmel
282c245c20 cmake: also fixup on win32
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38794 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-20 22:26:46 +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
Kornel Benko
b5828f9df4 Gracefuly omit doc creation if no perl detected
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38787 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-19 07:44:04 +00:00
Peter Kümmel
4e922727e6 cmake: fix .dmg creation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38780 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-17 21:53:05 +00:00
Kornel Benko
d636936877 Added doxygen target if found doxygen executable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38775 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-16 10:51:33 +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
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
3090fee4e0 cmake: cleanup, merge two patches
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38748 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-14 07:41:05 +00:00
Peter Kümmel
b3cffb0fc0 cmake: LIBINTL_LIBRARIES could be empty
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38732 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-12 21:55:24 +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
6a953f81ad cmake on mac: build with external libintl, find gettext, build merged
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38729 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-12 21:11:35 +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
45ac3ef7d0 cmake: improve readability
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38694 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 18:34:39 +00:00
Peter Kümmel
05881b8ff5 cmake: better developer defaults enable NLS, build debug
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38693 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 18:30:43 +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
Peter Kümmel
8102ae514f cmake: restore history
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38690 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 17:21:45 +00:00
Peter Kümmel
80b12deb54 cmake: restore history
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38689 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 17:21:15 +00:00
Peter Kümmel
aa35a7033f cmake: restore history
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38688 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-10 17:16:49 +00:00
Peter Kümmel
3219d4c142 cmake: small msvc fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38679 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-09 22:31:13 +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
Peter Kümmel
7dd0314c72 cmake: remove 2.8 warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38609 a592a061-630c-0410-9148-cb99ea01b6c8
2011-05-07 11:34:20 +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