r40384 - lyx-devel/branches/BRANCH_2_0_X/development/cmake/src/tex2lyx

[uwestoehr]

Author: uwestoehr
Date: Mon Dec  5 22:16:10 2011
New Revision: 40384
URL: http://www.lyx.org/trac/changeset/40384

Log:
tex2lyx/CMakeLists.txt: backport r40375 and add missing file dependency

Modified:
   lyx-devel/branches/BRANCH_2_0_X/development/cmake/src/tex2lyx/CMakeLists.txt

Modified: 
lyx-devel/branches/BRANCH_2_0_X/development/cmake/src/tex2lyx/CMakeLists.txt
==============================================================================
--- 
lyx-devel/branches/BRANCH_2_0_X/development/cmake/src/tex2lyx/CMakeLists.txt    
    Mon Dec  5 22:13:02 2011        (r40383)
+++ 
lyx-devel/branches/BRANCH_2_0_X/development/cmake/src/tex2lyx/CMakeLists.txt    
    Mon Dec  5 22:16:10 2011        (r40384)
@@ -14,8 +14,8 @@
 
 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 @@
 
 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}