From: Peter Kümmel <syntheticpp@gmx.net>
Date: Fri, 11 Feb 2011 02:20:23 +0000 (+0000)
Subject: cmake: fix merged build
X-Git-Tag: 2.0.0~794
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=58d9848d93870a60f9665989c662243ba109140a;p=lyx.git

cmake: fix merged build

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

diff --git a/development/cmake/src/client/CMakeLists.txt b/development/cmake/src/client/CMakeLists.txt
index 90b407ce58..ce1d9faa21 100644
--- a/development/cmake/src/client/CMakeLists.txt
+++ b/development/cmake/src/client/CMakeLists.txt
@@ -19,6 +19,10 @@ include_directories(BEFORE
 	"${TOP_SRC_DIR}/boost" 
 	${ZLIB_INCLUDE_DIR})
 
+if(LYX_MERGE_FILES)
+	set(_lyxclient_sources ${_lyxclient_sources} ${TOP_SRC_DIR}/src/TexRow.cpp)
+endif()
+
 add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers})
 
 target_link_libraries(${_lyxclient}