X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=3f3ebe9ac41e565b05c77fa93143525063c5ee0e;hb=f1f63fcad0a5512dc277fd8e401ac6cd5736c699;hp=58405216f5754be79d8aba7c874bde76db1f1f01;hpb=6a953f81ad619c8271edf31a54da4f83747ca27d;p=lyx.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 58405216f5..3f3ebe9ac4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -76,10 +76,6 @@ if (LYX_DEVEL_VERSION)
 	add_definitions(-DDEVEL_VERSION)
 endif()
 
-if(APPLE)
-	list(APPEND dont_merge ${TOP_SRC_DIR}/src/TexRow.cpp)
-endif()
-
 
 if (LYX_MERGE_FILES)
 	if(dont_merge)
@@ -91,8 +87,9 @@ endif()
 
 if (LYX_VLD)
 	configure_file(${vld_path}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/vld.ini COPYONLY)
-	configure_file(${vld_path}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt COPYONLY)
+	set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt PROPERTIES GENERATED TRUE)
 	set(vld_files ${CMAKE_CURRENT_BINARY_DIR}/vld.ini ${CMAKE_CURRENT_BINARY_DIR}/memory_leak_report.txt)
+	lyx_add_info_files(VLD ${vld_files})
 endif()
 
 if(WIN32)
@@ -108,8 +105,10 @@ lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.msvc)
 lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/modules/*)
 lyx_find_info_files(LyXUiFiles ${TOP_SRC_DIR}/lib/ui/*)
 
+
 add_executable(${_lyx}
 	${WIN32_CONSOLE}
+	${LYX_BUILD_BUNDLE}
 	${lyx_sources}
 	${lyx_headers}
 	${vld_files}
@@ -118,6 +117,7 @@ add_executable(${_lyx}
 	${lyx_cmake_files}
 )
 
+
 lyx_add_gcc_pch(${_lyx})
 
 target_link_libraries(${_lyx}
@@ -127,17 +127,11 @@ target_link_libraries(${_lyx}
 	frontend_qt4
 	graphics
 	support
+	${LIBINTL_LIBRARIES}
 	${ICONV_LIBRARY}
 	${QT_QTMAIN_LIBRARY}
 	${vld_dll})
 
-if(NOT LYX_EXTERNAL_LIBINTL OR WIN32)
-  # TODO remove, use LIBINTL_LIBRARIES
-  target_link_libraries(${_lyx} intl)
-  add_dependencies(${_lyx} intl_target)
-else()
-	target_link_libraries(${_lyx} ${LIBINTL_LIBRARIES})
-endif()
 
 if(HUNSPELL_FOUND)
 	target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY})
@@ -148,10 +142,17 @@ endif()
 if(ENCHANT_FOUND)
 	target_link_libraries(${_lyx} ${ENCHANT_LIBRARY})
 endif()
+if(Magic_FOUND)
+	target_link_libraries(${_lyx} ${Magic_LIBRARY})
+endif()
 
 if(APPLE)
 	target_link_libraries(${_lyx} "-bind_at_load")
-	target_link_libraries(${_lyx} "-framework Carbon")
+	if(LYX_COCOA)
+		target_link_libraries(${_lyx} "-framework Cocoa")
+	else()
+		target_link_libraries(${_lyx} "-framework AppKit")
+	endif()
 endif()
 
 if(MINGW)
@@ -160,5 +161,18 @@ endif()
 
 project_source_group("${GROUP_CODE}" lyx_sources lyx_headers)
 
-install(TARGETS ${_lyx} DESTINATION bin)
+
+install(TARGETS ${_lyx}
+	RUNTIME DESTINATION bin
+	BUNDLE DESTINATION .)
+
+if(LYX_BUNDLE)
+	if(NOT APPLE)
+		set(installed_lyx ${CMAKE_INSTALL_PREFIX}/bin/${_lyx}${CMAKE_EXECUTABLE_SUFFIX})
+	else()
+		set(installed_lyx ${CMAKE_INSTALL_PREFIX}/${_lyx}.app)
+	endif()
+	install(CODE "include(BundleUtilities)
+			fixup_bundle(\"${installed_lyx}\" \"\" \"\") " COMPONENT RUNTIME)
+endif()