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

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 448c3316a9..00a577f323 100644
--- 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,12 +32,17 @@ 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}
@@ -51,15 +57,17 @@ if(WIN32)
 endif()
 
 if(APPLE)
-	target_link_libraries(${_tex2lyx} "-framework Carbon")
+	target_link_libraries(${_tex2lyx} "-framework AppKit")
 endif()
 
-if(NOT LYX_EXTERNAL_LIBINTL OR WIN32)
-  target_link_libraries(${_tex2lyx} intl)
-  add_dependencies(${_tex2lyx} intl_target)
-endif()
 
 project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers)
 
-install(TARGETS ${_tex2lyx} DESTINATION bin)
+if(LYX_BUNDLE)
+	install(TARGETS ${_tex2lyx}
+		RUNTIME DESTINATION bin
+		BUNDLE DESTINATION .)
+else()
+	install(TARGETS ${_tex2lyx} DESTINATION bin)
+endif()