Cmake build:

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

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 7fbd12f7f65901b399504f0694c4f09f45992beb..496cbdd0537b56916fc72a03b6685d1f182afedd 100644 (file)
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -12,10 +12,11 @@ project(${_tex2lyx})
 set(LINKED_sources ${TOP_SRC_DIR}/src/lengthcommon.cpp)
 set(LINKED_headers)
 
-foreach(_src insets/InsetLayout Color Counters
-       Encoding FloatList Floating
-       Layout LayoutFile LayoutModuleList Lexer ModuleList TextClass
-       FontInfo Spacing)
+foreach(_src graphics/GraphicsParams insets/ExternalTemplate
+       insets/ExternalTransforms insets/InsetLayout Author Color Counters
+       Encoding FloatList Floating FontInfo LaTeXPackages Layout
+       LayoutFile LayoutModuleList Length Lexer ModuleList TextClass
+       Spacing version)
        list(APPEND LINKED_sources ${TOP_SRC_DIR}/src/${_src}.cpp)
        list(APPEND LINKED_headers ${TOP_SRC_DIR}/src/${_src}.h)
 endforeach(_src)
@@ -31,19 +32,25 @@ include_directories(BEFORE
 
 add_definitions(-DTEX2LYX)
 
+if(WIN32)
+       set(FILE_RC ${TOP_SRC_DIR}/development/cmake/lyx.rc)
+       message(STATUS "Using icon defined in resource file: ${FILE_RC}")
+endif()
+
 if(NOT LYX_MERGE_FILES)
-       add_executable(${_tex2lyx} ${tex2lyx_sources} ${LINKED_sources} ${tex2lyx_headers} ${LINKED_headers})
+       add_executable(${_tex2lyx} ${tex2lyx_sources} ${LINKED_sources} ${tex2lyx_headers} ${LINKED_headers}    ${FILE_RC})
 else()
        lyx_const_touched_files(_allinone  tex2lyx_sources)
        lyx_const_touched_files(_allinone_linked  LINKED_sources)
-       add_executable(${_tex2lyx} ${_allinone_files} ${_allinone_linked_files})
+       add_executable(${_tex2lyx} ${_allinone_files} ${_allinone_linked_files} ${FILE_RC})
 endif()
 
 target_link_libraries(${_tex2lyx}
        support
        ${Lyx_Boost_Libraries}
        ${QT_QTCORE_LIBRARY}
-       ${LIBINTL_LIBRARIES}
+       ${QT_QTGUI_LIBRARY}
+       ${intl_link}
        ${ICONV_LIBRARY})
 
 if(WIN32)
@@ -51,10 +58,19 @@ if(WIN32)
 endif()
 
 if(APPLE)
-       target_link_libraries(${_tex2lyx} "-framework Carbon")
+       target_link_libraries(${_tex2lyx} "-framework AppKit")
 endif()
 
+
 project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers)
 
-install(TARGETS ${_tex2lyx} DESTINATION bin)
+add_subdirectory(test)
+
+if(LYX_BUNDLE)
+       install(TARGETS ${_tex2lyx}
+               RUNTIME DESTINATION bin
+               BUNDLE DESTINATION .)
+else()
+       install(TARGETS ${_tex2lyx} DESTINATION bin)
+endif()