Fix #10778 (issue with CJK and language nesting)

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

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 4fa809a395394d607322efce024abcdf5919559d..04cbdfe8e970d83c4b2bb1bb53dd8519115c2d4d 100644 (file)
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -5,7 +5,6 @@
 # Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
 #
 
-set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
 project(${_tex2lyx})
 
 # There is no header file lengthcommon.h
@@ -21,21 +20,16 @@ foreach(_src graphics/GraphicsParams insets/ExternalTemplate
        list(APPEND LINKED_headers ${TOP_SRC_DIR}/src/${_src}.h)
 endforeach(_src)
 
-set_property(SOURCE "${TOP_SRC_DIR}/src/version.cpp" APPEND PROPERTY COMPILE_DEFINITIONS  LYX_DATE="${LYX_DATE}")
-
 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})
 
-add_definitions(-DTEX2LYX)
-
-if(WIN32)
-       set(FILE_RC ${TOP_SRC_DIR}/development/cmake/lyx.rc)
+if(WIN32 AND NOT MINGW)
+       set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
        message(STATUS "Using icon defined in resource file: ${FILE_RC}")
 endif()
 
@@ -46,19 +40,27 @@ 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")
 
 target_link_libraries(${_tex2lyx}
        support
        ${Lyx_Boost_Libraries}
        ${QT_QTCORE_LIBRARY}
        ${QT_QTGUI_LIBRARY}
-       ${LIBINTL_LIBRARIES}
        ${ICONV_LIBRARY})
 
+lyx_target_link_libraries(${_tex2lyx} Magic)
+
+add_dependencies(${_tex2lyx} lyx_version)
+
 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()
@@ -68,11 +70,5 @@ project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers)
 
 add_subdirectory(test)
 
-if(LYX_BUNDLE)
-       install(TARGETS ${_tex2lyx}
-               RUNTIME DESTINATION bin
-               BUNDLE DESTINATION .)
-else()
-       install(TARGETS ${_tex2lyx} DESTINATION bin)
-endif()
+install(TARGETS ${_tex2lyx} DESTINATION ${LYX_UTILITIES_INSTALL_PATH})