tex2lyx: reset language after polyglossia lang environment has been closed

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

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index ed827bbc642ea79610864868b2c76a078fee9063..1927655c7f7fffc1ee1d80cf3663f13d19461321 100644 (file)
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -12,7 +12,7 @@ set(LINKED_sources ${TOP_SRC_DIR}/src/lengthcommon.cpp)
 set(LINKED_headers)
 
 foreach(_src graphics/GraphicsParams insets/ExternalTemplate
-       insets/ExternalTransforms insets/InsetLayout Author Color Counters
+       insets/ExternalTransforms insets/InsetLayout Author CiteEnginesList Color Counters
        Encoding FloatList Floating FontInfo LaTeXPackages Layout
        LayoutFile LayoutModuleList Length Lexer ModuleList TextClass
        Spacing version)
@@ -24,9 +24,8 @@ file(GLOB tex2lyx_sources ${TOP_SRC_DIR}/src/tex2lyx/${LYX_CPP_FILES})
 
 file(GLOB tex2lyx_headers ${TOP_SRC_DIR}/src/tex2lyx/${LYX_HPP_FILES})
 
-include_directories(BEFORE
-       ${TOP_SRC_DIR}/src/tex2lyx
-       ${TOP_SRC_DIR}/src/support/minizip
+include_directories((BEFORE
+       ${TOP_SRC_DIR}/src/tex2lyx)
        ${ZLIB_INCLUDE_DIR})
 
 if(WIN32 AND NOT MINGW)
@@ -41,15 +40,18 @@ else()
        lyx_const_touched_files(_allinone_linked  LINKED_sources)
        add_executable(${_tex2lyx} ${_allinone_files} ${_allinone_linked_files} ${FILE_RC})
 endif()
-set_target_properties(${_tex2lyx} PROPERTIES FOLDER "applications/TeX2LyX")
+set_target_properties(${_tex2lyx} PROPERTIES
+       FOLDER "applications/TeX2LyX"
+       INTERPROCEDURAL_OPTIMIZATION ${LYX_IPO_SUPPORTED})
 
 target_link_libraries(${_tex2lyx}
        support
        ${Lyx_Boost_Libraries}
        ${QT_QTCORE_LIBRARY}
        ${QT_QTGUI_LIBRARY}
-       ${ICONV_LIBRARY}
-        ${Magic_LIBRARY})
+       ${ICONV_LIBRARY})
+
+lyx_target_link_libraries(${_tex2lyx} Magic)
 
 add_dependencies(${_tex2lyx} lyx_version)
 
@@ -57,6 +59,10 @@ if(WIN32)
        target_link_libraries(${_tex2lyx} shlwapi ole32 psapi)
 endif()
 
+if(CYGWIN)
+       target_link_libraries(${_tex2lyx} shlwapi ole32)
+endif()
+
 if(APPLE)
        target_link_libraries(${_tex2lyx} "-framework AppKit")
 endif()