X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FCMakeLists.txt;h=38ae574c314f717ab850ec6ed7ce8afd97414343;hb=f146bded7a1eed37174efca16ea63e65f93f6fbc;hp=bfe3d542afc13ee88808c400a5fed53514b6973b;hpb=81500fc99b8a2f28bf429c159713784b1715bc63;p=lyx.git

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index bfe3d542af..38ae574c31 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -29,9 +29,7 @@ include_directories(BEFORE
 	${TOP_SRC_DIR}/src/support/minizip
 	${ZLIB_INCLUDE_DIR})
 
-add_definitions(-DTEX2LYX)
-
-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()
@@ -43,15 +41,17 @@ 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}
-	${intl_link}
 	${ICONV_LIBRARY})
 
+lyx_target_link_libraries(${_tex2lyx} Magic)
+
 add_dependencies(${_tex2lyx} lyx_version)
 
 if(WIN32)
@@ -67,11 +67,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})