X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fcmake%2Fsrc%2Ftex2lyx%2FCMakeLists.txt;h=56be3be82ccead6299d8093439908df6c04f0119;hb=56a7a6778356ad1b70eff4ae6a960f2cad414ea1;hp=ac844c60da51dbc83c1194788ff1191da4323f10;hpb=56b1078e78310a838b444c4ff1ae53d199e74282;p=features.git

diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt
index ac844c60da..56be3be82c 100644
--- a/development/cmake/src/tex2lyx/CMakeLists.txt
+++ b/development/cmake/src/tex2lyx/CMakeLists.txt
@@ -14,7 +14,8 @@ set(LINKED_headers)
 
 foreach(_src insets/InsetLayout Color Counters
     Encoding FloatList Floating
-    Layout LayoutModuleList Lexer ModuleList TextClass)
+    Layout LayoutModuleList Lexer ModuleList TextClass
+    FontInfo Spacing)
   list(APPEND LINKED_sources ${TOP_SRC_DIR}/src/${_src}.cpp)
   list(APPEND LINKED_headers ${TOP_SRC_DIR}/src/${_src}.h)
 endforeach(_src)
@@ -23,15 +24,12 @@ file(GLOB tex2lyx_sources ${TOP_SRC_DIR}/src/tex2lyx/${LYX_CPP_FILES})
 
 file(GLOB tex2lyx_headers ${TOP_SRC_DIR}/src/tex2lyx/${LYX_HPP_FILES})
 
-list(APPEND tex2lyx_sources ${TOP_SRC_DIR}/src/FontInfo.cpp)
-list(APPEND tex2lyx_headers ${TOP_SRC_DIR}/src/FontInfo.h)
-
 include_directories(BEFORE ${TOP_SRC_DIR}/src/tex2lyx
   ${TOP_SRC_DIR}/src/support/minizip ${ZLIB_INCLUDE_DIR})
 
 add_definitions(-DTEX2LYX)
 
-if(NOT MERGE_FILES)
+if(NOT LYX_MERGE_FILES)
 	add_executable(${_tex2lyx} ${tex2lyx_sources} ${LINKED_sources}
 		${tex2lyx_headers} ${LINKED_headers})
 else()
@@ -45,7 +43,8 @@ target_link_libraries(${_tex2lyx}
 	${Lyx_Boost_Libraries}
 	${QT_QTCORE_LIBRARY}
 	${LIBINTL_LIBRARIES}
-	${ICONV_LIBRARY})
+	${ICONV_LIBRARY}
+	${OPENSSL_LIBRARIES})
 
 if(WIN32)
 	target_link_libraries(${_tex2lyx} shlwapi ole32 psapi)