Correct early return position for if use_pixmap_cache_ check

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

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index bfe3d542afc13ee88808c400a5fed53514b6973b..09bcc2bf3625dc2d6ede7c32b6a34b80598b6410 100644 (file)
--- 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,21 +41,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}
-       ${intl_link}
        ${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()
@@ -67,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})