From: Stefan Schimanski <sts@lyx.org>
Date: Thu, 13 Dec 2007 21:41:47 +0000 (+0000)
Subject:  r16067@goedel:  sts | 2007-12-09 20:45:36 +0100
X-Git-Tag: 1.6.10~6933
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=6785bc0273f1bea98cd207b330efd2124dff868d;p=lyx.git

 r16067@goedel:  sts | 2007-12-09 20:45:36 +0100
  r16044@goedel (orig r22008):  kuemmel | 2007-12-08 11:50:30 +0100
  fix wrong tex2lyx hack
  r16045@goedel (orig r22009):  kuemmel | 2007-12-08 12:07:43 +0100
  fix wrong tex2lyx hack
  r16046@goedel (orig r22010):  kuemmel | 2007-12-08 12:20:47 +0100
  cmake: fix tex2lyx linker error
  r16047@goedel (orig r22011):  spitz | 2007-12-08 12:21:00 +0100
  Sanitize CJK support (fix bug 3561, 4349 and 4337):

  * src/output_latex.{cpp, h}:
  	- Many changes in order to allow CJK in a mulitlingual context.
  * src/Paragraph.cpp:
  	- Fix file encoding switch and language nesting with CJK.
  * src/Buffer.cpp:
  	- Move the opening and closing CJK and lanaguage tags to ouput_latex.cpp.
  * src/Font.cpp:
  	- switchEncoding call now takes runparams as argument.

  r16048@goedel (orig r22012):  younes | 2007-12-08 14:59:32 +0100
  Fix bug 4413 (http://bugzilla.lyx.org/show_bug.cgi?id=4413)
  The problem was that name_ was a const pointer and the pointer pointed to nothing after leaving the ctor.
  Andre': <docstring> is included in every dialog anyway via GuiDialog.h -> InsetCommandParams.h -> docstring.h"; so this change won't affect compilation time.

  r16049@goedel (orig r22014):  younes | 2007-12-08 15:24:11 +0100
  * Dialog: name_ is const and is ascii.

  r16050@goedel (orig r22015):  younes | 2007-12-08 15:29:29 +0100
  No need to update the prefs dialog if it is not visible.

  r16051@goedel (orig r22016):  uwestoehr | 2007-12-08 15:58:53 +0100
  preamble.cpp: remove unused code
  r16052@goedel (orig r22017):  younes | 2007-12-08 16:02:34 +0100
  * fix enabling/disabling of LyXErr.

  r16053@goedel (orig r22019):  spitz | 2007-12-08 16:38:39 +0100
  * lib/lyx2lyx/lyx_1_5.py:
  	- fix bug 4333.
  r16054@goedel (orig r22022):  spitz | 2007-12-08 16:56:19 +0100
  * lib/lyx2lyx/lyx_1_1.py (revert_latexcommand_index):
  	- umlauts must be reverted to escaped forms.
  r16055@goedel (orig r22023):  younes | 2007-12-08 17:22:05 +0100
  Fix bug 4410 (http://bugzilla.lyx.org/show_bug.cgi?id=4410).

  r16056@goedel (orig r22024):  younes | 2007-12-08 17:36:56 +0100
  Revert 22023 and really fix bug 4410 (http://bugzilla.lyx.org/show_bug.cgi?id=4410).


  r16057@goedel (orig r22026):  kuemmel | 2007-12-08 21:46:03 +0100
  add progress view of system calls
  r16058@goedel (orig r22027):  uwestoehr | 2007-12-08 21:49:01 +0100
  preamble.cpp: don't add \makeatother twice

  \makeatother and \makeatletter are already added by LyX around the user preamble
  r16059@goedel (orig r22029):  younes | 2007-12-09 09:43:08 +0100
  Fix Drag&Drop. LFUN_FILE_OPEN is not handled by GuiView::dispatch() (yet).

  r16060@goedel (orig r22030):  spitz | 2007-12-09 12:40:59 +0100
  fix typos.
  r16061@goedel (orig r22032):  uwestoehr | 2007-12-09 14:40:03 +0100
  tex2lyx/text.cpp: support for all quotation marks (bug2703).
  r16062@goedel (orig r22034):  uwestoehr | 2007-12-09 15:14:34 +0100
  preamble.cpp: code simplification to r21970 suggested by Angus
  r16063@goedel (orig r22040):  uwestoehr | 2007-12-09 16:26:31 +0100
  preamble.cpp: fix whitespace
  r16064@goedel (orig r22044):  kuemmel | 2007-12-09 18:31:25 +0100
  also check for moc files in src/support
  r16065@goedel (orig r22046):  uwestoehr | 2007-12-09 18:42:05 +0100
  preamble.cpp: full babel language support for tex2lyx
  r16066@goedel (orig r22047):  uwestoehr | 2007-12-09 18:47:41 +0100
  set encoding from utf8 back to latin1



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22135 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt
index 63585dca21..f9f5795681 100644
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/development/cmake/src/support/CMakeLists.txt
@@ -50,7 +50,7 @@ else()
 	set_source_files_properties(_allinone_touched.C
 		PROPERTIES OBJECT_DEPENDS "${depends_moc}")	
 	add_library(support ${library_type} ${_allinone_files}
-		${support_minizip_sources} ${support_minizip_cpp_sources} ${support_headers})
+		${support_minizip_sources} ${support_minizip_cpp_sources} ${support_headers} ${dont_merge})
 endif()