Cmake build: Omit also hidden header files from globbing

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

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 751926e301651a57c9bf92602a7160bf93eca239..38ae574c314f717ab850ec6ed7ce8afd97414343 100644 (file)
--- 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()
@@ -51,9 +48,10 @@ target_link_libraries(${_tex2lyx}
        ${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)
@@ -69,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})