tex2lyx/text.cpp: whitespace fix

[lyx.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0cd01f5e0ea3416e1dcc19b82e5cd6a123ef3535..3f3ebe9ac41e565b05c77fa93143525063c5ee0e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,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)
@@ -104,6 +105,7 @@ 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}
@@ -140,13 +142,16 @@ 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")
        if(LYX_COCOA)
                target_link_libraries(${_lyx} "-framework Cocoa")
        else()
-               target_link_libraries(${_lyx} "-framework Carbon")
+               target_link_libraries(${_lyx} "-framework AppKit")
        endif()
 endif()