From: Uwe Stöhr <uwestoehr@web.de>
Date: Mon, 5 Dec 2011 21:16:10 +0000 (+0000)
Subject: tex2lyx/CMakeLists.txt: backport r40375 and add missing file dependency
X-Git-Tag: 2.0.3~156
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=efd3ef88bb85ceb34e747b1cfbe091fe1a96b99e;p=features.git

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
---

diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt
index b6b0cd1118..6ba1384fca 100644
--- a/development/cmake/src/tex2lyx/CMakeLists.txt
+++ b/development/cmake/src/tex2lyx/CMakeLists.txt
@@ -14,8 +14,8 @@ set(LINKED_headers)
 
 foreach(_src insets/InsetLayout Author Color Counters
 	Encoding FloatList Floating FontInfo LaTeXPackages
-	Layout LayoutFile LayoutModuleList Lexer ModuleList TextClass
-	Spacing version)
+	Layout LayoutFile LayoutModuleList lengthcommon Lexer
+	ModuleList Spacing TextClass version)
 	list(APPEND LINKED_sources ${TOP_SRC_DIR}/src/${_src}.cpp)
 	list(APPEND LINKED_headers ${TOP_SRC_DIR}/src/${_src}.h)
 endforeach(_src)
@@ -31,12 +31,17 @@ include_directories(BEFORE
 
 add_definitions(-DTEX2LYX)
 
+if(WIN32)
+	set(FILE_RC ${TOP_SRC_DIR}/development/cmake/lyx.rc) 
+	message(STATUS "Using icon defined in resource file: ${FILE_RC}") 
+	endif() 
+
 if(NOT LYX_MERGE_FILES)
-	add_executable(${_tex2lyx} ${tex2lyx_sources} ${LINKED_sources} ${tex2lyx_headers} ${LINKED_headers})
+	add_executable(${_tex2lyx} ${tex2lyx_sources} ${LINKED_sources} ${tex2lyx_headers} ${LINKED_headers} ${FILE_RC})
 else()
 	lyx_const_touched_files(_allinone  tex2lyx_sources)
 	lyx_const_touched_files(_allinone_linked  LINKED_sources)
-	add_executable(${_tex2lyx} ${_allinone_files} ${_allinone_linked_files})
+	add_executable(${_tex2lyx} ${_allinone_files} ${_allinone_linked_files} ${FILE_RC})
 endif()
 
 target_link_libraries(${_tex2lyx}