X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FCMakeLists.txt;h=04cbdfe8e970d83c4b2bb1bb53dd8519115c2d4d;hb=237193f8a888777192981136469a5d4febb8e9d8;hp=f3bbcf717d363c9f5b9a3c0bcc0d07b223db0d62;hpb=14de3aa49b4fb38093ff12ccaf3200daf0f62c77;p=lyx.git

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index f3bbcf717d..04cbdfe8e9 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -24,12 +24,11 @@ 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)
+if(WIN32 AND NOT MINGW)
 	set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
 	message(STATUS "Using icon defined in resource file: ${FILE_RC}")
 endif()
@@ -50,12 +49,18 @@ target_link_libraries(${_tex2lyx}
 	${QT_QTGUI_LIBRARY}
 	${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()