add first version of .lyx file encryption. It's disabled by default and could out...

[features.git] / development / cmake / src / tex2lyx / CMakeLists.txt

diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt
index 13857f9116b396939ae21527e3d9bd2aecef49ff..56be3be82ccead6299d8093439908df6c04f0119 100644 (file)
--- 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)
@@ -28,7 +29,7 @@ include_directories(BEFORE ${TOP_SRC_DIR}/src/tex2lyx
 
 add_definitions(-DTEX2LYX)
 
-if(NOT MERGE_FILES)
+if(NOT LYX_MERGE_FILES)
        add_executable(${_tex2lyx} ${tex2lyx_sources} ${LINKED_sources}
                ${tex2lyx_headers} ${LINKED_headers})
 else()
@@ -37,18 +38,13 @@ else()
        add_executable(${_tex2lyx} ${_allinone_files} ${_allinone_linked_files})
 endif()
 
-
-if(Boost_FOUND)
-  target_link_libraries(${_tex2lyx} ${Boost_LIBRARIES})
-else()
-  target_link_libraries(${_tex2lyx} boost_regex)
-endif()
-
 target_link_libraries(${_tex2lyx}
        support
+       ${Lyx_Boost_Libraries}
        ${QT_QTCORE_LIBRARY}
        ${LIBINTL_LIBRARIES}
-       ${ICONV_LIBRARY})
+       ${ICONV_LIBRARY}
+       ${OPENSSL_LIBRARIES})
 
 if(WIN32)
        target_link_libraries(${_tex2lyx} shlwapi ole32 psapi)