Cmake build: Project names *should* be uniq

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

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index a744b5055211e1a85ca35df6bb9066ca7245d931..36db7234dffb9b88df89a8ece80c1f8fddf7b7c2 100644 (file)
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -12,7 +12,7 @@ set(LINKED_sources ${TOP_SRC_DIR}/src/lengthcommon.cpp)
 set(LINKED_headers)
 
 foreach(_src graphics/GraphicsParams insets/ExternalTemplate
 set(LINKED_headers)
 
 foreach(_src graphics/GraphicsParams insets/ExternalTemplate

-       insets/ExternalTransforms insets/InsetLayout Author Color Counters
+       insets/ExternalTransforms insets/InsetLayout Author CiteEnginesList Color Counters

        Encoding FloatList Floating FontInfo LaTeXPackages Layout
        LayoutFile LayoutModuleList Length Lexer ModuleList TextClass
        Spacing version)
        Encoding FloatList Floating FontInfo LaTeXPackages Layout
        LayoutFile LayoutModuleList Length Lexer ModuleList TextClass
        Spacing version)


@@ -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})
 
 
 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})
 
        ${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()
        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})
 
        ${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()
 
 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()
 if(APPLE)
        target_link_libraries(${_tex2lyx} "-framework AppKit")
 endif()


@@ -65,11 +70,5 @@ project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers)
 
 add_subdirectory(test)
 
 
 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})