X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FCMakeLists.txt;h=09bcc2bf3625dc2d6ede7c32b6a34b80598b6410;hb=b6b263b9fc4cd70849c60de9f8849c346b3c12ab;hp=b1d7463b6eb4017fd5d53a7f93cecbd38e6dd530;hpb=a3c864102aaeef6ed58f00b92e6b53ca1d6f9b1e;p=lyx.git

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index b1d7463b6e..09bcc2bf36 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -29,10 +29,7 @@ include_directories(BEFORE
 	${TOP_SRC_DIR}/src/support/minizip
 	${ZLIB_INCLUDE_DIR})
 
-add_definitions(-DTEX2LYX)
-add_definitions(-DNO_LAYOUT_CSS)
-
-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()
@@ -53,12 +50,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()
@@ -68,11 +71,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})