X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2FCMakeLists.txt;h=04cbdfe8e970d83c4b2bb1bb53dd8519115c2d4d;hb=237193f8a888777192981136469a5d4febb8e9d8;hp=448c3316a973430897220abf618f9166d7fd9523;hpb=5c1666c0e1370eb3ec5d0a5981684cc199810dcd;p=lyx.git

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 448c3316a9..04cbdfe8e9 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -5,17 +5,17 @@
 # Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
 #
 
-set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
 project(${_tex2lyx})
 
 # There is no header file lengthcommon.h
 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)
@@ -24,42 +24,51 @@ file(GLOB tex2lyx_sources ${TOP_SRC_DIR}/src/tex2lyx/${LYX_CPP_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})
 
-add_definitions(-DTEX2LYX)
+if(WIN32 AND NOT MINGW)
+	set(FILE_RC ${TOP_CMAKE_PATH}/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()
+set_target_properties(${_tex2lyx} PROPERTIES FOLDER "applications/TeX2LyX")
 
 target_link_libraries(${_tex2lyx}
 	support
 	${Lyx_Boost_Libraries}
 	${QT_QTCORE_LIBRARY}
-	${LIBINTL_LIBRARIES}
+	${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()
 
-if(APPLE)
-	target_link_libraries(${_tex2lyx} "-framework Carbon")
+if(CYGWIN)
+	target_link_libraries(${_tex2lyx} shlwapi ole32)
 endif()
 
-if(NOT LYX_EXTERNAL_LIBINTL OR WIN32)
-  target_link_libraries(${_tex2lyx} intl)
-  add_dependencies(${_tex2lyx} intl_target)
+if(APPLE)
+	target_link_libraries(${_tex2lyx} "-framework AppKit")
 endif()
 
+
 project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers)
 
-install(TARGETS ${_tex2lyx} DESTINATION bin)
+add_subdirectory(test)
+
+install(TARGETS ${_tex2lyx} DESTINATION ${LYX_UTILITIES_INSTALL_PATH})