Fix more warnings and simplify a tiny bit.

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

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index b1d7463b6eb4017fd5d53a7f93cecbd38e6dd530..1927655c7f7fffc1ee1d80cf3663f13d19461321 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,15 +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})
 

-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()
        set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
        message(STATUS "Using icon defined in resource file: ${FILE_RC}")
 endif()


@@ -44,7 +40,9 @@ else()
        lyx_const_touched_files(_allinone_linked  LINKED_sources)
        add_executable(${_tex2lyx} ${_allinone_files} ${_allinone_linked_files} ${FILE_RC})
 endif()
        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")
+set_target_properties(${_tex2lyx} PROPERTIES
+       FOLDER "applications/TeX2LyX"
+       INTERPROCEDURAL_OPTIMIZATION ${LYX_IPO_SUPPORTED})

 
 target_link_libraries(${_tex2lyx}
        support
 
 target_link_libraries(${_tex2lyx}
        support


@@ -53,12 +51,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()


@@ -68,11 +72,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})