From 69661217d27b0a6ee323fadec0d0d35e9e4ebe81 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 4 Jun 2018 16:25:31 +0300 Subject: [PATCH] Remove PCH (#148) This commit brings many changes: 1. Remove cotire; 2. Remove PCH files (stdafx.xxx) and mentions; 3. Rearrange and clean includes: 3.1. Remove core includes path, use full header path core/xxx; 3.2. Move object_ptr to separate file base/object_ptr.h; 3.3. Add missing includes; 5. Add forward decls; 6. Get rid of some Qt private parts; 7. Fix ALL compilation errors after removing cotire on Windows, Linux, MacOS. Closes #133. Related to #96. --- CMakeLists.txt | 3 +- Telegram/CMakeLists.txt | 22 +- Telegram/SourceFiles/apiwrap.cpp | 1 + Telegram/SourceFiles/apiwrap.h | 4 + Telegram/SourceFiles/app.cpp | 5 + Telegram/SourceFiles/app.h | 5 + Telegram/SourceFiles/application.cpp | 3 + Telegram/SourceFiles/application.h | 7 +- Telegram/SourceFiles/auth_session.cpp | 2 + Telegram/SourceFiles/auth_session.h | 3 + Telegram/SourceFiles/base/algorithm.h | 3 + Telegram/SourceFiles/base/assertion.h | 1 + Telegram/SourceFiles/base/flat_map.h | 1 + Telegram/SourceFiles/base/flat_set.h | 1 + Telegram/SourceFiles/base/functors.h | 2 + Telegram/SourceFiles/base/lambda.h | 1 + Telegram/SourceFiles/base/lambda_guard.h | 1 + Telegram/SourceFiles/base/object_ptr.h | 127 + Telegram/SourceFiles/base/observer.cpp | 1 + Telegram/SourceFiles/base/observer.h | 3 + Telegram/SourceFiles/base/openssl_help.h | 2 + Telegram/SourceFiles/base/ordered_set.h | 2 +- Telegram/SourceFiles/base/parse_helper.h | 5 + Telegram/SourceFiles/base/qthelp_regex.h | 2 + Telegram/SourceFiles/base/qthelp_url.cpp | 4 +- Telegram/SourceFiles/base/qthelp_url.h | 4 + .../SourceFiles/base/runtime_composer.cpp | 1 + Telegram/SourceFiles/base/runtime_composer.h | 5 + Telegram/SourceFiles/base/task_queue.cpp | 7 +- Telegram/SourceFiles/base/task_queue.h | 4 + Telegram/SourceFiles/base/timer.cpp | 1 + Telegram/SourceFiles/base/timer.h | 2 + Telegram/SourceFiles/base/type_traits.h | 2 + Telegram/SourceFiles/base/weak_unique_ptr.h | 15 +- Telegram/SourceFiles/base/zlib_help.h | 4 + Telegram/SourceFiles/boxes/about_box.cpp | 1 + Telegram/SourceFiles/boxes/abstract_box.cpp | 1 + Telegram/SourceFiles/boxes/abstract_box.h | 6 +- .../SourceFiles/boxes/add_contact_box.cpp | 2 + Telegram/SourceFiles/boxes/autolock_box.cpp | 2 +- .../SourceFiles/boxes/change_phone_box.cpp | 4 +- Telegram/SourceFiles/boxes/confirm_box.h | 1 + .../SourceFiles/boxes/download_path_box.cpp | 1 + Telegram/SourceFiles/boxes/edit_color_box.cpp | 1 + .../boxes/edit_participant_box.cpp | 2 + .../SourceFiles/boxes/edit_privacy_box.cpp | 2 + Telegram/SourceFiles/boxes/language_box.cpp | 1 - .../SourceFiles/boxes/local_storage_box.cpp | 3 + .../SourceFiles/boxes/notifications_box.cpp | 1 + .../SourceFiles/boxes/notifications_box.h | 1 + Telegram/SourceFiles/boxes/passcode_box.cpp | 1 + Telegram/SourceFiles/boxes/peer_list_box.cpp | 1 + .../boxes/peer_list_controllers.cpp | 2 +- .../SourceFiles/boxes/peer_list_controllers.h | 1 + Telegram/SourceFiles/boxes/report_box.cpp | 1 + Telegram/SourceFiles/boxes/send_files_box.h | 1 + .../SourceFiles/boxes/sticker_set_box.cpp | 2 + Telegram/SourceFiles/boxes/username_box.cpp | 2 + .../calls/calls_box_controller.cpp | 1 + Telegram/SourceFiles/calls/calls_call.cpp | 3 +- .../calls/calls_emoji_fingerprint.h | 4 + Telegram/SourceFiles/calls/calls_instance.cpp | 7 + Telegram/SourceFiles/calls/calls_panel.cpp | 3 + Telegram/SourceFiles/calls/calls_top_bar.cpp | 1 + Telegram/SourceFiles/calls/calls_top_bar.h | 1 + .../SourceFiles/chat_helpers/bot_keyboard.cpp | 3 + .../SourceFiles/chat_helpers/bot_keyboard.h | 5 + .../chat_helpers/emoji_list_widget.cpp | 1 + .../chat_helpers/emoji_suggestions_widget.cpp | 5 +- .../chat_helpers/emoji_suggestions_widget.h | 3 + .../chat_helpers/field_autocomplete.cpp | 2 + .../chat_helpers/field_autocomplete.h | 4 + .../chat_helpers/gifs_list_widget.cpp | 2 + .../chat_helpers/message_field.cpp | 3 + .../chat_helpers/stickers_list_widget.cpp | 5 + .../chat_helpers/stickers_list_widget.h | 1 + .../SourceFiles/chat_helpers/tabbed_panel.cpp | 2 + .../SourceFiles/chat_helpers/tabbed_panel.h | 1 + .../chat_helpers/tabbed_selector.cpp | 1 + .../SourceFiles/codegen/common/cpp_file.cpp | 9 +- .../SourceFiles/codegen/common/cpp_file.h | 2 +- .../SourceFiles/codegen/emoji/generator.cpp | 4 + .../SourceFiles/codegen/lang/generator.cpp | 5 + .../SourceFiles/codegen/numbers/generator.cpp | 2 + .../codegen/scheme/codegen_scheme.py | 1 + .../SourceFiles/codegen/style/generator.cpp | 1 + Telegram/SourceFiles/config.h.in | 6 + Telegram/SourceFiles/core/basic_types.h | 10 +- Telegram/SourceFiles/core/click_handler.cpp | 1 + Telegram/SourceFiles/core/click_handler.h | 8 +- .../SourceFiles/core/click_handler_types.cpp | 4 + .../SourceFiles/core/click_handler_types.h | 4 + Telegram/SourceFiles/core/file_utilities.cpp | 3 + Telegram/SourceFiles/core/file_utilities.h | 5 + Telegram/SourceFiles/core/single_timer.h | 4 + Telegram/SourceFiles/core/utils.cpp | 6 + Telegram/SourceFiles/core/utils.h | 15 +- Telegram/SourceFiles/core/version.h | 2 +- .../data/data_abstract_structure.cpp | 2 + Telegram/SourceFiles/data/data_drafts.h | 3 + Telegram/SourceFiles/dialogs/dialogs_common.h | 2 + .../dialogs/dialogs_indexed_list.cpp | 1 + .../dialogs/dialogs_indexed_list.h | 1 + .../dialogs/dialogs_inner_widget.cpp | 2 + .../dialogs/dialogs_inner_widget.h | 1 + .../SourceFiles/dialogs/dialogs_layout.cpp | 2 +- Telegram/SourceFiles/dialogs/dialogs_layout.h | 3 + Telegram/SourceFiles/dialogs/dialogs_list.h | 2 + .../dialogs_search_from_controllers.cpp | 1 + .../SourceFiles/dialogs/dialogs_widget.cpp | 2 +- Telegram/SourceFiles/dialogs/dialogs_widget.h | 4 + Telegram/SourceFiles/facades.cpp | 36 + Telegram/SourceFiles/facades.h | 45 +- Telegram/SourceFiles/history/history.cpp | 31 +- Telegram/SourceFiles/history/history.h | 10 +- .../history/history_admin_log_filter.cpp | 3 +- .../history/history_admin_log_inner.cpp | 5 +- .../history/history_admin_log_inner.h | 2 + .../history/history_admin_log_item.cpp | 1 + .../history/history_admin_log_item.h | 7 + .../SourceFiles/history/history_drag_area.h | 3 + .../history/history_inner_widget.cpp | 3 +- .../history/history_inner_widget.h | 3 + Telegram/SourceFiles/history/history_item.cpp | 3 +- Telegram/SourceFiles/history/history_item.h | 7 + .../history/history_location_manager.cpp | 5 + .../history/history_location_manager.h | 9 + Telegram/SourceFiles/history/history_media.h | 4 + .../SourceFiles/history/history_message.h | 7 + .../SourceFiles/history/history_service.h | 8 + .../history/history_service_layout.h | 4 + .../SourceFiles/history/history_widget.cpp | 8 +- Telegram/SourceFiles/history/history_widget.h | 2 + .../inline_bot_layout_internal.cpp | 1 + .../inline_bots/inline_bot_layout_item.h | 2 + .../inline_bots/inline_bot_result.h | 2 + .../inline_bots/inline_bot_send_data.cpp | 2 +- .../inline_bots/inline_bot_send_data.h | 2 + .../inline_bots/inline_results_widget.cpp | 3 +- Telegram/SourceFiles/intro/introcode.cpp | 1 + Telegram/SourceFiles/intro/introphone.cpp | 1 + Telegram/SourceFiles/intro/introsignup.cpp | 1 + .../SourceFiles/lang/lang_cloud_manager.cpp | 1 + .../SourceFiles/lang/lang_cloud_manager.h | 1 + .../SourceFiles/lang/lang_file_parser.cpp | 2 +- Telegram/SourceFiles/lang/lang_instance.h | 4 + Telegram/SourceFiles/lang/lang_keys.cpp | 1 + Telegram/SourceFiles/lang/lang_keys.h | 2 + Telegram/SourceFiles/lang/lang_tag.cpp | 2 +- Telegram/SourceFiles/lang/lang_tag.h | 2 + Telegram/SourceFiles/lang/lang_translator.h | 2 + Telegram/SourceFiles/layerwidget.h | 9 + Telegram/SourceFiles/layout.h | 4 + Telegram/SourceFiles/logs.cpp | 2 + Telegram/SourceFiles/logs.h | 5 + Telegram/SourceFiles/main.cpp | 1 - Telegram/SourceFiles/mainwidget.cpp | 3 + Telegram/SourceFiles/mainwidget.h | 3 + Telegram/SourceFiles/mainwindow.cpp | 8 + Telegram/SourceFiles/mainwindow.h | 10 + Telegram/SourceFiles/media/media_audio.cpp | 6 +- Telegram/SourceFiles/media/media_audio.h | 4 + .../SourceFiles/media/media_audio_capture.h | 5 + .../SourceFiles/media/media_audio_loader.h | 4 + .../SourceFiles/media/media_audio_track.h | 1 + .../media/media_child_ffmpeg_loader.h | 1 + .../media/media_clip_implementation.cpp | 1 + .../media/media_clip_implementation.h | 6 + Telegram/SourceFiles/media/media_clip_qtgif.h | 1 + .../SourceFiles/media/media_clip_reader.cpp | 2 +- .../SourceFiles/media/media_clip_reader.h | 2 + .../media/player/media_player_button.h | 1 + .../media/player/media_player_cover.cpp | 4 +- .../media/player/media_player_cover.h | 3 + .../media/player/media_player_float.cpp | 5 +- .../media/player/media_player_float.h | 6 + .../media/player/media_player_instance.cpp | 1 + .../media/player/media_player_instance.h | 4 + .../media/player/media_player_list.cpp | 5 +- .../media/player/media_player_list.h | 7 + .../media/player/media_player_panel.cpp | 5 +- .../player/media_player_volume_controller.cpp | 5 +- .../media/player/media_player_widget.cpp | 5 +- .../media/player/media_player_widget.h | 1 + .../media/view/media_clip_controller.cpp | 5 +- .../media/view/media_clip_playback.cpp | 1 - .../media/view/media_clip_playback.h | 2 + .../view/media_clip_volume_controller.cpp | 6 +- Telegram/SourceFiles/mediaview.cpp | 7 + Telegram/SourceFiles/mediaview.h | 9 + Telegram/SourceFiles/messenger.cpp | 8 + Telegram/SourceFiles/messenger.h | 12 + Telegram/SourceFiles/mtproto/auth_key.h | 5 + .../SourceFiles/mtproto/config_loader.cpp | 2 + Telegram/SourceFiles/mtproto/connection.cpp | 5 +- Telegram/SourceFiles/mtproto/connection.h | 5 +- .../mtproto/connection_abstract.cpp | 2 + .../SourceFiles/mtproto/connection_auto.cpp | 3 +- .../SourceFiles/mtproto/connection_auto.h | 3 + .../SourceFiles/mtproto/connection_http.cpp | 2 + .../SourceFiles/mtproto/connection_http.h | 5 + .../SourceFiles/mtproto/connection_tcp.cpp | 2 + Telegram/SourceFiles/mtproto/connection_tcp.h | 4 + Telegram/SourceFiles/mtproto/core_types.cpp | 1 + Telegram/SourceFiles/mtproto/core_types.h | 6 +- Telegram/SourceFiles/mtproto/dc_options.cpp | 5 + Telegram/SourceFiles/mtproto/dc_options.h | 1 + Telegram/SourceFiles/mtproto/dcenter.h | 12 +- Telegram/SourceFiles/mtproto/mtp_instance.h | 9 + Telegram/SourceFiles/mtproto/rpc_sender.h | 7 + .../SourceFiles/mtproto/rsa_public_key.cpp | 1 + Telegram/SourceFiles/mtproto/rsa_public_key.h | 3 + Telegram/SourceFiles/mtproto/sender.h | 3 + Telegram/SourceFiles/mtproto/session.cpp | 3 + .../mtproto/special_config_request.cpp | 5 + .../mtproto/special_config_request.h | 6 + Telegram/SourceFiles/observer_peer.cpp | 1 + Telegram/SourceFiles/observer_peer.h | 3 + Telegram/SourceFiles/passcodewidget.cpp | 4 + Telegram/SourceFiles/passcodewidget.h | 7 + .../platform/linux/file_utilities_linux.cpp | 5 +- .../linux/linux_desktop_environment.cpp | 7 +- .../platform/linux/linux_libnotify.cpp | 2 + .../SourceFiles/platform/linux/linux_libs.h | 3 + .../platform/linux/main_window_linux.cpp | 2 + .../platform/linux/main_window_linux.h | 5 + .../platform/linux/specific_linux.cpp | 4 + .../platform/linux/specific_linux.h | 13 +- .../platform/mac/file_utilities_mac.mm | 5 +- .../SourceFiles/platform/mac/mac_utilities.mm | 1 - .../platform/mac/main_window_mac.h | 4 + .../platform/mac/main_window_mac.mm | 1 - .../platform/mac/notifications_manager_mac.mm | 3 +- .../SourceFiles/platform/mac/specific_mac.h | 6 + .../SourceFiles/platform/mac/specific_mac.mm | 5 +- .../SourceFiles/platform/mac/specific_mac_p.h | 5 + .../platform/mac/specific_mac_p.mm | 1 - .../platform/mac/window_title_mac.mm | 3 +- .../SourceFiles/platform/platform_specific.h | 6 + .../SourceFiles/platform/win/audio_win.cpp | 4 +- .../platform/win/file_utilities_win.cpp | 13 +- .../platform/win/main_window_win.cpp | 12 +- .../platform/win/main_window_win.h | 2 + .../win/notifications_manager_win.cpp | 10 +- .../SourceFiles/platform/win/specific_win.cpp | 11 +- .../SourceFiles/platform/win/specific_win.h | 9 + .../platform/win/window_title_win.cpp | 3 +- .../win/windows_app_user_model_id.cpp | 7 +- .../SourceFiles/platform/win/windows_dlls.cpp | 4 +- .../SourceFiles/platform/win/windows_dlls.h | 5 +- .../platform/win/windows_event_filter.cpp | 5 +- .../platform/win/windows_event_filter.h | 1 + .../profile/profile_back_button.cpp | 3 + .../SourceFiles/profile/profile_back_button.h | 1 + .../profile/profile_block_channel_members.h | 1 + .../profile/profile_block_group_members.h | 7 + .../SourceFiles/profile/profile_block_info.h | 2 + .../profile/profile_block_invite_link.cpp | 3 + .../profile/profile_block_peer_list.cpp | 1 + .../profile/profile_block_peer_list.h | 1 + .../profile/profile_block_shared_media.cpp | 1 + .../profile/profile_block_shared_media.h | 3 + .../profile/profile_block_widget.h | 11 +- .../profile/profile_common_groups_section.h | 3 + .../SourceFiles/profile/profile_cover.cpp | 3 + Telegram/SourceFiles/profile/profile_cover.h | 19 + .../profile/profile_cover_drop_area.cpp | 2 + .../profile/profile_cover_drop_area.h | 5 + .../SourceFiles/profile/profile_fixed_bar.cpp | 2 + .../SourceFiles/profile/profile_fixed_bar.h | 9 + .../profile/profile_inner_widget.h | 13 +- .../profile/profile_section_memento.h | 4 +- .../profile/profile_userpic_button.cpp | 1 + .../profile/profile_userpic_button.h | 1 + .../SourceFiles/profile/profile_widget.cpp | 1 + Telegram/SourceFiles/settings.cpp | 2 + Telegram/SourceFiles/settings.h | 2 + .../settings/settings_advanced_widget.cpp | 5 + .../settings/settings_advanced_widget.h | 3 + .../settings/settings_block_widget.h | 4 + .../settings/settings_chat_settings_widget.h | 4 + .../SourceFiles/settings/settings_cover.cpp | 4 + .../SourceFiles/settings/settings_cover.h | 5 + .../SourceFiles/settings/settings_fixed_bar.h | 6 + .../settings/settings_general_widget.cpp | 1 + .../settings/settings_info_widget.cpp | 1 + .../settings/settings_info_widget.h | 4 + .../settings/settings_inner_widget.cpp | 2 + .../settings/settings_privacy_widget.cpp | 1 + .../settings/settings_privacy_widget.h | 3 + .../settings/settings_scale_widget.cpp | 2 + Telegram/SourceFiles/shortcuts.cpp | 6 + Telegram/SourceFiles/shortcuts.h | 3 + Telegram/SourceFiles/stdafx.cpp | 23 - Telegram/SourceFiles/stdafx.h | 129 - Telegram/SourceFiles/storage/file_download.h | 4 + Telegram/SourceFiles/storage/file_upload.cpp | 1 + Telegram/SourceFiles/storage/file_upload.h | 4 + .../SourceFiles/storage/localimageloader.cpp | 2 + .../SourceFiles/storage/localimageloader.h | 7 + Telegram/SourceFiles/storage/localstorage.cpp | 5 + Telegram/SourceFiles/storage/localstorage.h | 1 + .../storage/serialize_document.cpp | 2 + Telegram/SourceFiles/structs.cpp | 1 + Telegram/SourceFiles/structs.h | 10 + Telegram/SourceFiles/ui/abstract_button.cpp | 2 + Telegram/SourceFiles/ui/animation.cpp | 2 + Telegram/SourceFiles/ui/animation.h | 20 +- Telegram/SourceFiles/ui/countryinput.cpp | 1 + Telegram/SourceFiles/ui/countryinput.h | 1 + .../ui/effects/cross_animation.cpp | 3 + .../SourceFiles/ui/effects/cross_animation.h | 3 + .../ui/effects/panel_animation.cpp | 3 + .../ui/effects/radial_animation.cpp | 1 + .../SourceFiles/ui/effects/radial_animation.h | 2 + .../ui/effects/ripple_animation.cpp | 5 + .../SourceFiles/ui/effects/ripple_animation.h | 1 + .../SourceFiles/ui/effects/round_checkbox.cpp | 5 + .../SourceFiles/ui/effects/round_checkbox.h | 6 + .../ui/effects/send_action_animations.cpp | 1 + .../ui/effects/send_action_animations.h | 2 + .../ui/effects/slide_animation.cpp | 1 + .../SourceFiles/ui/effects/slide_animation.h | 5 + .../ui/effects/widget_fade_wrap.cpp | 5 + .../SourceFiles/ui/effects/widget_fade_wrap.h | 11 +- .../ui/effects/widget_slide_wrap.h | 2 + Telegram/SourceFiles/ui/emoji_config.h | 1 + Telegram/SourceFiles/ui/images.cpp | 3 + Telegram/SourceFiles/ui/images.h | 3 + Telegram/SourceFiles/ui/special_buttons.cpp | 5 + Telegram/SourceFiles/ui/style/style_core.cpp | 2 + Telegram/SourceFiles/ui/style/style_core.h | 7 + .../SourceFiles/ui/style/style_core_color.cpp | 1 + .../SourceFiles/ui/style/style_core_color.h | 4 + .../SourceFiles/ui/style/style_core_font.cpp | 6 + .../SourceFiles/ui/style/style_core_font.h | 4 + .../SourceFiles/ui/style/style_core_icon.cpp | 5 + .../SourceFiles/ui/style/style_core_icon.h | 2 + .../SourceFiles/ui/style/style_core_types.h | 12 +- Telegram/SourceFiles/ui/text/text.cpp | 1 + Telegram/SourceFiles/ui/text/text.h | 7 +- Telegram/SourceFiles/ui/text/text_block.cpp | 2 + Telegram/SourceFiles/ui/text/text_block.h | 4 + Telegram/SourceFiles/ui/text/text_entity.cpp | 3 + Telegram/SourceFiles/ui/text/text_entity.h | 6 + Telegram/SourceFiles/ui/toast/toast.cpp | 3 + Telegram/SourceFiles/ui/toast/toast.h | 8 + .../SourceFiles/ui/toast/toast_widget.cpp | 1 + Telegram/SourceFiles/ui/twidget.cpp | 9 +- Telegram/SourceFiles/ui/twidget.h | 114 +- Telegram/SourceFiles/ui/widgets/buttons.cpp | 1 + Telegram/SourceFiles/ui/widgets/buttons.h | 2 +- Telegram/SourceFiles/ui/widgets/checkbox.cpp | 4 + Telegram/SourceFiles/ui/widgets/checkbox.h | 1 + .../ui/widgets/continuous_sliders.cpp | 6 + .../ui/widgets/continuous_sliders.h | 5 +- .../ui/widgets/discrete_sliders.cpp | 3 + .../SourceFiles/ui/widgets/discrete_sliders.h | 6 + .../SourceFiles/ui/widgets/dropdown_menu.h | 3 + .../SourceFiles/ui/widgets/inner_dropdown.cpp | 3 + .../SourceFiles/ui/widgets/inner_dropdown.h | 2 + .../SourceFiles/ui/widgets/input_fields.cpp | 8 + .../SourceFiles/ui/widgets/input_fields.h | 9 +- Telegram/SourceFiles/ui/widgets/labels.cpp | 6 + Telegram/SourceFiles/ui/widgets/labels.h | 6 + Telegram/SourceFiles/ui/widgets/menu.cpp | 3 + Telegram/SourceFiles/ui/widgets/menu.h | 6 + .../SourceFiles/ui/widgets/multi_select.cpp | 3 + .../SourceFiles/ui/widgets/multi_select.h | 11 + .../SourceFiles/ui/widgets/popup_menu.cpp | 4 + Telegram/SourceFiles/ui/widgets/popup_menu.h | 3 + .../SourceFiles/ui/widgets/scroll_area.cpp | 5 + Telegram/SourceFiles/ui/widgets/scroll_area.h | 7 + Telegram/SourceFiles/ui/widgets/shadow.h | 2 + Telegram/SourceFiles/ui/widgets/tooltip.cpp | 6 + Telegram/SourceFiles/ui/widgets/tooltip.h | 3 + Telegram/SourceFiles/window/main_window.cpp | 9 + Telegram/SourceFiles/window/main_window.h | 4 + .../window/notifications_manager.cpp | 1 + .../window/notifications_manager.h | 7 + .../window/notifications_manager_default.cpp | 4 + .../window/notifications_manager_default.h | 6 + .../SourceFiles/window/player_wrap_widget.cpp | 1 + Telegram/SourceFiles/window/section_memento.h | 4 +- .../SourceFiles/window/section_widget.cpp | 6 + Telegram/SourceFiles/window/section_widget.h | 1 + .../window/themes/window_theme.cpp | 3 + .../SourceFiles/window/themes/window_theme.h | 4 + .../window/themes/window_theme_editor.cpp | 5 + .../window/themes/window_theme_editor.h | 12 + .../themes/window_theme_editor_block.cpp | 4 + .../window/themes/window_theme_editor_block.h | 3 + .../window/themes/window_theme_preview.cpp | 4 + .../window/themes/window_theme_preview.h | 1 + .../window/themes/window_theme_warning.cpp | 1 + .../window/themes/window_theme_warning.h | 8 + Telegram/SourceFiles/window/top_bar_widget.h | 1 + .../SourceFiles/window/window_controller.h | 4 + .../SourceFiles/window/window_main_menu.h | 2 + .../window/window_slide_animation.h | 5 + Telegram/SourceFiles/window/window_title.h | 4 + .../emoji_suggestions/emoji_suggestions.cpp | 2 + .../emoji_suggestions/emoji_suggestions.h | 1 + cotire/.gitattributes | 8 - cotire/.gitignore | 5 - cotire/.gitrepo | 11 - cotire/CMake/cotire.cmake | 4202 ----------------- cotire/CMakeLists.txt | 21 - cotire/HISTORY.md | 354 -- cotire/MANUAL.md | 791 ---- cotire/Patches/OpenCV-2.3.1.patch | 299 -- cotire/Patches/README.md | 24 - cotire/Patches/bullet-2.80-rev2531.patch | 389 -- cotire/Patches/clang-3.0.src.patch | 35 - cotire/Patches/clang-3.1.src.patch | 35 - cotire/Patches/clang-3.3.src.patch | 46 - cotire/Patches/clang-3.4.src.patch | 48 - cotire/Patches/clang-3.5.src.patch | 39 - cotire/Patches/clapack-3.2.1-CMAKE.patch | 93 - cotire/Patches/cmake-2.8.7.patch | 218 - cotire/Patches/cminpack-1.1.4.patch | 18 - cotire/Patches/hdf5-1.8.8.patch | 118 - cotire/Patches/libpng-1.5.9.patch | 38 - cotire/Patches/llvm-3.0.src.patch | 69 - cotire/Patches/llvm-3.1.src.patch | 69 - cotire/Patches/llvm-3.3.src.patch | 128 - cotire/Patches/llvm-3.4.src.patch | 100 - cotire/Patches/llvm-3.5.src.patch | 99 - cotire/Patches/yaml-cpp.patch | 37 - cotire/Patches/zlib-1.2.6.patch | 23 - cotire/README.md | 137 - cotire/license | 22 - cotire/src/CMakeLists.txt | 31 - cotire/src/example.cpp | 24 - cotire/src/example.h | 10 - cotire/src/log.cpp | 17 - cotire/src/log.h | 10 - cotire/src/main.cpp | 12 - 438 files changed, 1603 insertions(+), 8013 deletions(-) create mode 100644 Telegram/SourceFiles/base/object_ptr.h delete mode 100644 Telegram/SourceFiles/stdafx.cpp delete mode 100644 Telegram/SourceFiles/stdafx.h delete mode 100644 cotire/.gitattributes delete mode 100755 cotire/.gitignore delete mode 100644 cotire/.gitrepo delete mode 100644 cotire/CMake/cotire.cmake delete mode 100644 cotire/CMakeLists.txt delete mode 100644 cotire/HISTORY.md delete mode 100644 cotire/MANUAL.md delete mode 100644 cotire/Patches/OpenCV-2.3.1.patch delete mode 100644 cotire/Patches/README.md delete mode 100644 cotire/Patches/bullet-2.80-rev2531.patch delete mode 100644 cotire/Patches/clang-3.0.src.patch delete mode 100644 cotire/Patches/clang-3.1.src.patch delete mode 100644 cotire/Patches/clang-3.3.src.patch delete mode 100644 cotire/Patches/clang-3.4.src.patch delete mode 100644 cotire/Patches/clang-3.5.src.patch delete mode 100644 cotire/Patches/clapack-3.2.1-CMAKE.patch delete mode 100644 cotire/Patches/cmake-2.8.7.patch delete mode 100644 cotire/Patches/cminpack-1.1.4.patch delete mode 100644 cotire/Patches/hdf5-1.8.8.patch delete mode 100644 cotire/Patches/libpng-1.5.9.patch delete mode 100644 cotire/Patches/llvm-3.0.src.patch delete mode 100644 cotire/Patches/llvm-3.1.src.patch delete mode 100644 cotire/Patches/llvm-3.3.src.patch delete mode 100644 cotire/Patches/llvm-3.4.src.patch delete mode 100644 cotire/Patches/llvm-3.5.src.patch delete mode 100644 cotire/Patches/yaml-cpp.patch delete mode 100644 cotire/Patches/zlib-1.2.6.patch delete mode 100644 cotire/README.md delete mode 100644 cotire/license delete mode 100644 cotire/src/CMakeLists.txt delete mode 100644 cotire/src/example.cpp delete mode 100644 cotire/src/example.h delete mode 100644 cotire/src/log.cpp delete mode 100644 cotire/src/log.h delete mode 100644 cotire/src/main.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 4856f57f8..1f62e9d03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,7 @@ cmake_minimum_required(VERSION 3.10) project(kepka-desktop) -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cotire/CMake;${PROJECT_SOURCE_DIR}/modules/") -include(cotire) +set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules/") include(CTest) if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.10) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 9d98feb23..c6d723cfd 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -12,6 +12,9 @@ if (PACKAGED_BUILD) add_definitions(-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION) endif() + +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -H") + ##================================================ ## Codegen Tools ##================================================ @@ -189,8 +192,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) # cmakelists file. To do: get rid of the PCH requirement for more flexible build structure. add_executable(Telegram WIN32 MACOSX_BUNDLE - SourceFiles/stdafx.cpp - ${CMAKE_CURRENT_BINARY_DIR}/styles/palette.cpp ${CMAKE_CURRENT_BINARY_DIR}/numbers.cpp ${CMAKE_CURRENT_BINARY_DIR}/lang_auto.cpp @@ -568,7 +569,7 @@ include_directories(ThirdParty) # For minizip/ but we use fully-qualified include_directories(ThirdParty/GSL/include ThirdParty/variant/include ThirdParty/emoji_suggestions ThirdParty/libtgvoip) -include_directories(SourceFiles SourceFiles/core) +include_directories(SourceFiles) include_directories(${OPENAL_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${OPUS_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS} ${ALSA_INCLUDE_DIRS} ${PULSEAUDIO_INCLUDE_DIR}) @@ -581,9 +582,9 @@ endif() if (WIN32) add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_USING_V110_SDK71_ - -DWIN32 -D_WINDOWS -D_UNICODE -DUNICODE + -DWIN32 -D_WINDOWS -D_UNICODE -DUNICODE -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP - -DHAVE_STDINT_H) + -DHAVE_STDINT_H -DNOMINMAX) endif() add_definitions(-DAL_LIBTYPE_STATIC) @@ -706,17 +707,6 @@ endif() target_link_libraries(Telegram Threads::Threads) -set_target_properties(Telegram - PROPERTIES - COTIRE_CXX_PREFIX_HEADER_INIT SourceFiles/stdafx.h - COTIRE_ADD_UNITY_BUILD FALSE -) -cotire(Telegram) - -# See https://github.com/sakra/cotire/blob/master/MANUAL.md#objective-c -# ObjC and ObjC++ files cannot be cotired, so they have to include appropriate Qt and Tg -# headers themselves, this applies to macOS platform sources. - ##================================================ ## Tests ##================================================ diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index f8b4f1d92..a776a9d86 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -35,6 +35,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/notifications_manager.h" #include "chat_helpers/message_field.h" #include "chat_helpers/stickers.h" +#include "base/algorithm.h" // for_each_apply namespace { diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h index 855c2bd68..f0d23a5ee 100644 --- a/Telegram/SourceFiles/apiwrap.h +++ b/Telegram/SourceFiles/apiwrap.h @@ -28,6 +28,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/sender.h" #include "base/flat_map.h" #include "base/flat_set.h" +#include "structs.h" +#include "facades.h" class AuthSession; @@ -43,6 +45,8 @@ inline const MTPVector *getChatsFromMessagesChats(const MTPmessages_Cha } // namespace Api +class History; + class ApiWrap : private MTP::Sender, private base::Subscriber { public: ApiWrap(not_null session); diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index f66e7eb61..4d49df8be 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -50,6 +50,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/notifications_manager.h" #include "platform/platform_notifications_manager.h" +#include // used in list of PhotosData +#include +#include +#include + namespace { App::LaunchState _launchState = App::Launched; diff --git a/Telegram/SourceFiles/app.h b/Telegram/SourceFiles/app.h index bd7b35f89..4a1516610 100644 --- a/Telegram/SourceFiles/app.h +++ b/Telegram/SourceFiles/app.h @@ -20,10 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include + +#include "ui/animation.h" #include "core/basic_types.h" #include "history/history.h" #include "history/history_item.h" #include "layout.h" +#include "media/media_clip_reader.h" class Messenger; class MainWindow; diff --git a/Telegram/SourceFiles/application.cpp b/Telegram/SourceFiles/application.cpp index 11602af75..fceb20319 100644 --- a/Telegram/SourceFiles/application.cpp +++ b/Telegram/SourceFiles/application.cpp @@ -28,6 +28,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "messenger.h" #include "base/timer.h" +#include +#include + namespace { // @todo are there no other ways to get/set hex? diff --git a/Telegram/SourceFiles/application.h b/Telegram/SourceFiles/application.h index f4e45024e..268d55562 100644 --- a/Telegram/SourceFiles/application.h +++ b/Telegram/SourceFiles/application.h @@ -20,8 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "stdafx.h" +#include + #include +#include +#include + +class Messenger; class Application : public QApplication { Q_OBJECT diff --git a/Telegram/SourceFiles/auth_session.cpp b/Telegram/SourceFiles/auth_session.cpp index 42603af23..baa06dd49 100644 --- a/Telegram/SourceFiles/auth_session.cpp +++ b/Telegram/SourceFiles/auth_session.cpp @@ -32,6 +32,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/section_widget.h" #include "chat_helpers/tabbed_selector.h" +#include "app.h" // App::user + namespace { constexpr auto kAutoLockTimeoutLateMs = TimeMs(3000); diff --git a/Telegram/SourceFiles/auth_session.h b/Telegram/SourceFiles/auth_session.h index 3124a26b3..412de760a 100644 --- a/Telegram/SourceFiles/auth_session.h +++ b/Telegram/SourceFiles/auth_session.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "base/timer.h" +#include "structs.h" namespace Storage { class Downloader; @@ -43,6 +44,8 @@ enum class SelectorTab; } // namespace ChatHelpers class ApiWrap; +class History; +class HistoryItem; class AuthSessionData final { public: diff --git a/Telegram/SourceFiles/base/algorithm.h b/Telegram/SourceFiles/base/algorithm.h index e3aafda87..0b03ec674 100644 --- a/Telegram/SourceFiles/base/algorithm.h +++ b/Telegram/SourceFiles/base/algorithm.h @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include + namespace base { // @todo use ranges-v3 here diff --git a/Telegram/SourceFiles/base/assertion.h b/Telegram/SourceFiles/base/assertion.h index cd638d563..2d0ea39a5 100644 --- a/Telegram/SourceFiles/base/assertion.h +++ b/Telegram/SourceFiles/base/assertion.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include +#include namespace base { namespace assertion { diff --git a/Telegram/SourceFiles/base/flat_map.h b/Telegram/SourceFiles/base/flat_map.h index d1dc28fd3..4f90b5e63 100644 --- a/Telegram/SourceFiles/base/flat_map.h +++ b/Telegram/SourceFiles/base/flat_map.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include +#include #include "base/optional.h" namespace base { diff --git a/Telegram/SourceFiles/base/flat_set.h b/Telegram/SourceFiles/base/flat_set.h index 7e578d334..449b680fe 100644 --- a/Telegram/SourceFiles/base/flat_set.h +++ b/Telegram/SourceFiles/base/flat_set.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include +#include namespace base { diff --git a/Telegram/SourceFiles/base/functors.h b/Telegram/SourceFiles/base/functors.h index bdf905e1e..72f161b7c 100644 --- a/Telegram/SourceFiles/base/functors.h +++ b/Telegram/SourceFiles/base/functors.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include + namespace base { namespace functors { diff --git a/Telegram/SourceFiles/base/lambda.h b/Telegram/SourceFiles/base/lambda.h index 48742ce75..115aea9c0 100644 --- a/Telegram/SourceFiles/base/lambda.h +++ b/Telegram/SourceFiles/base/lambda.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include +#include // std::max_align_t #ifndef Assert #define LambdaAssertDefined diff --git a/Telegram/SourceFiles/base/lambda_guard.h b/Telegram/SourceFiles/base/lambda_guard.h index c68825d3c..c28a5ed40 100644 --- a/Telegram/SourceFiles/base/lambda_guard.h +++ b/Telegram/SourceFiles/base/lambda_guard.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include +#include "base/lambda.h" namespace base { diff --git a/Telegram/SourceFiles/base/object_ptr.h b/Telegram/SourceFiles/base/object_ptr.h new file mode 100644 index 000000000..ad04c7ddc --- /dev/null +++ b/Telegram/SourceFiles/base/object_ptr.h @@ -0,0 +1,127 @@ +/* +This file is part of Kepka - The Unofficial Telegram Desktop client, +see https://github.com/procxx/kepka + +Kepka is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/procxx/kepka/blob/master/LICENSE +Copyright (c) 2018 pro.cxx Community +*/ +#pragma once + +#include +#include +#include "core/utils.h" // @todo used for base::take + +// Smart pointer for QObject*, has move semantics, destroys object if it doesn't have a parent. +template +class object_ptr { +public: + object_ptr(std::nullptr_t) { + } + + // No default constructor, but constructors with at least + // one argument are simply make functions. + template + explicit object_ptr(Parent &&parent, Args&&... args) : _object(new Object(std::forward(parent), std::forward(args)...)) { + } + + object_ptr(const object_ptr &other) = delete; + object_ptr &operator=(const object_ptr &other) = delete; + object_ptr(object_ptr &&other) : _object(base::take(other._object)) { + } + object_ptr &operator=(object_ptr &&other) { + auto temp = std::move(other); + destroy(); + std::swap(_object, temp._object); + return *this; + } + + template ::value>> + object_ptr(object_ptr &&other) : _object(base::take(other._object)) { + } + + template ::value>> + object_ptr &operator=(object_ptr &&other) { + _object = base::take(other._object); + return *this; + } + + object_ptr &operator=(std::nullptr_t) { + _object = nullptr; + return *this; + } + + // So we can pass this pointer to methods like connect(). + Object *data() const { + return static_cast(_object.data()); + } + operator Object*() const { + return data(); + } + + explicit operator bool() const { + return _object != nullptr; + } + + Object *operator->() const { + return data(); + } + Object &operator*() const { + return *data(); + } + + // Use that instead "= new Object(parent, ...)" + template + void create(Parent &&parent, Args&&... args) { + destroy(); + _object = new Object(std::forward(parent), std::forward(args)...); + } + void destroy() { + delete base::take(_object); + } + void destroyDelayed() { + if (_object) { + if (auto widget = base::up_cast(data())) { + widget->hide(); + } + base::take(_object)->deleteLater(); + } + } + + ~object_ptr() { + if (auto pointer = _object) { + if (!pointer->parent()) { + destroy(); + } + } + } + + template + friend object_ptr static_object_cast(object_ptr source); + +private: + template + friend class object_ptr; + + QPointer _object; + +}; + +template +inline object_ptr static_object_cast(object_ptr source) { + auto result = object_ptr(nullptr); + result._object = static_cast(base::take(source._object).data()); + return std::move(result); +} diff --git a/Telegram/SourceFiles/base/observer.cpp b/Telegram/SourceFiles/base/observer.cpp index 071470da6..377ef0101 100644 --- a/Telegram/SourceFiles/base/observer.cpp +++ b/Telegram/SourceFiles/base/observer.cpp @@ -19,6 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "base/observer.h" +#include "facades.h" namespace base { namespace internal { diff --git a/Telegram/SourceFiles/base/observer.h b/Telegram/SourceFiles/base/observer.h index 2ddd09d9c..c0d6cf0cb 100644 --- a/Telegram/SourceFiles/base/observer.h +++ b/Telegram/SourceFiles/base/observer.h @@ -23,7 +23,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include #include +#include "base/assertion.h" +#include "base/lambda.h" #include "base/type_traits.h" +#include "core/utils.h" namespace base { namespace internal { diff --git a/Telegram/SourceFiles/base/openssl_help.h b/Telegram/SourceFiles/base/openssl_help.h index c17b60c69..d00af74ea 100644 --- a/Telegram/SourceFiles/base/openssl_help.h +++ b/Telegram/SourceFiles/base/openssl_help.h @@ -24,6 +24,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include +#include "base/assertion.h" +#include "core/utils.h" namespace openssl { class Context { diff --git a/Telegram/SourceFiles/base/ordered_set.h b/Telegram/SourceFiles/base/ordered_set.h index 9305be4b9..51c02c8ff 100644 --- a/Telegram/SourceFiles/base/ordered_set.h +++ b/Telegram/SourceFiles/base/ordered_set.h @@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include +#include // ordered set template based on QMap template diff --git a/Telegram/SourceFiles/base/parse_helper.h b/Telegram/SourceFiles/base/parse_helper.h index 064736b89..7b1b553a9 100644 --- a/Telegram/SourceFiles/base/parse_helper.h +++ b/Telegram/SourceFiles/base/parse_helper.h @@ -20,6 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include "base/assertion.h" + + namespace base { namespace parse { diff --git a/Telegram/SourceFiles/base/qthelp_regex.h b/Telegram/SourceFiles/base/qthelp_regex.h index 39c7739d0..398503483 100644 --- a/Telegram/SourceFiles/base/qthelp_regex.h +++ b/Telegram/SourceFiles/base/qthelp_regex.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include + #include "base/flags.h" namespace qthelp { diff --git a/Telegram/SourceFiles/base/qthelp_url.cpp b/Telegram/SourceFiles/base/qthelp_url.cpp index d3c4d9b1c..4f04c013a 100644 --- a/Telegram/SourceFiles/base/qthelp_url.cpp +++ b/Telegram/SourceFiles/base/qthelp_url.cpp @@ -18,6 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include "core/utils.h" #include "base/qthelp_url.h" namespace qthelp { @@ -32,7 +34,7 @@ QMap url_parse_params(const QString ¶ms, UrlParamNameTrans return name; }; - auto paramsList = params.split('&'); + auto paramsList = params.split('&'); for_const (auto ¶m, paramsList) { // Skip params without a name (starting with '='). if (auto separatorPosition = param.indexOf('=')) { diff --git a/Telegram/SourceFiles/base/qthelp_url.h b/Telegram/SourceFiles/base/qthelp_url.h index 5b4204597..de86b77f3 100644 --- a/Telegram/SourceFiles/base/qthelp_url.h +++ b/Telegram/SourceFiles/base/qthelp_url.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include + namespace qthelp { inline QString url_encode(const QString &part) { diff --git a/Telegram/SourceFiles/base/runtime_composer.cpp b/Telegram/SourceFiles/base/runtime_composer.cpp index 3c9148e54..2abbe86d6 100644 --- a/Telegram/SourceFiles/base/runtime_composer.cpp +++ b/Telegram/SourceFiles/base/runtime_composer.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "base/runtime_composer.h" struct RuntimeComposerMetadatasMap { diff --git a/Telegram/SourceFiles/base/runtime_composer.h b/Telegram/SourceFiles/base/runtime_composer.h index 4afd18608..4af9ba0cd 100644 --- a/Telegram/SourceFiles/base/runtime_composer.h +++ b/Telegram/SourceFiles/base/runtime_composer.h @@ -19,6 +19,11 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include + +#include "base/assertion.h" +#include "core/utils.h" class RuntimeComposer; typedef void(*RuntimeComponentConstruct)(void *location, RuntimeComposer *composer); diff --git a/Telegram/SourceFiles/base/task_queue.cpp b/Telegram/SourceFiles/base/task_queue.cpp index b31d07a5d..c54ae16db 100644 --- a/Telegram/SourceFiles/base/task_queue.cpp +++ b/Telegram/SourceFiles/base/task_queue.cpp @@ -18,10 +18,15 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "base/task_queue.h" +#include #include #include +#include +#include +#include "base/assertion.h" +#include "base/task_queue.h" +#include "facades.h" namespace base { namespace { diff --git a/Telegram/SourceFiles/base/task_queue.h b/Telegram/SourceFiles/base/task_queue.h index f444e8d0a..00425b9ad 100644 --- a/Telegram/SourceFiles/base/task_queue.h +++ b/Telegram/SourceFiles/base/task_queue.h @@ -21,6 +21,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include +#include +#include +#include "base/lambda.h" +#include "base/timer.h" namespace base { diff --git a/Telegram/SourceFiles/base/timer.cpp b/Telegram/SourceFiles/base/timer.cpp index d7438179e..c590c5c78 100644 --- a/Telegram/SourceFiles/base/timer.cpp +++ b/Telegram/SourceFiles/base/timer.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "base/timer.h" namespace base { diff --git a/Telegram/SourceFiles/base/timer.h b/Telegram/SourceFiles/base/timer.h index 7835b7faa..c4882cd38 100644 --- a/Telegram/SourceFiles/base/timer.h +++ b/Telegram/SourceFiles/base/timer.h @@ -23,6 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "base/lambda.h" #include "base/observer.h" +using TimeMs = qint64; + namespace base { class Timer final : private QObject { diff --git a/Telegram/SourceFiles/base/type_traits.h b/Telegram/SourceFiles/base/type_traits.h index 4979ce656..b2c779686 100644 --- a/Telegram/SourceFiles/base/type_traits.h +++ b/Telegram/SourceFiles/base/type_traits.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include + namespace base { template diff --git a/Telegram/SourceFiles/base/weak_unique_ptr.h b/Telegram/SourceFiles/base/weak_unique_ptr.h index 7ae74f12f..0bdf7f69d 100644 --- a/Telegram/SourceFiles/base/weak_unique_ptr.h +++ b/Telegram/SourceFiles/base/weak_unique_ptr.h @@ -20,7 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include // @todo replace this with std::experimental::observer_ptr +#include +#include namespace base { @@ -131,11 +134,11 @@ weak_unique_ptr make_weak_unique(const std::unique_ptr &value) { #ifdef QT_VERSION template inline void InvokeQueued(base::enable_weak_from_this *context, Lambda &&lambda) { - QObject proxy; - QObject::connect(&proxy, &QObject::destroyed, QCoreApplication::instance(), [guard = base::make_weak_unique(context), lambda = std::forward(lambda)] { - if (guard) { - lambda(); - } - }, Qt::QueuedConnection); + QObject proxy; + QObject::connect(&proxy, &QObject::destroyed, QCoreApplication::instance(), [guard = base::make_weak_unique(context), lambda = std::forward(lambda)] { + if (guard) { + lambda(); + } + }, Qt::QueuedConnection); } #endif // QT_VERSION diff --git a/Telegram/SourceFiles/base/zlib_help.h b/Telegram/SourceFiles/base/zlib_help.h index e9b380c47..6873142b1 100644 --- a/Telegram/SourceFiles/base/zlib_help.h +++ b/Telegram/SourceFiles/base/zlib_help.h @@ -23,9 +23,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include + #include "minizip/zip.h" #include "minizip/unzip.h" +#include "logs.h" + namespace zlib { namespace internal { diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp index 649d321ec..5b395bd5b 100644 --- a/Telegram/SourceFiles/boxes/about_box.cpp +++ b/Telegram/SourceFiles/boxes/about_box.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "boxes/about_box.h" #include "config.h" diff --git a/Telegram/SourceFiles/boxes/abstract_box.cpp b/Telegram/SourceFiles/boxes/abstract_box.cpp index f0662a0a4..6a69446a6 100644 --- a/Telegram/SourceFiles/boxes/abstract_box.cpp +++ b/Telegram/SourceFiles/boxes/abstract_box.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "boxes/abstract_box.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/boxes/abstract_box.h b/Telegram/SourceFiles/boxes/abstract_box.h index 90a3b2775..4bc14265d 100644 --- a/Telegram/SourceFiles/boxes/abstract_box.h +++ b/Telegram/SourceFiles/boxes/abstract_box.h @@ -20,8 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "layerwidget.h" +#include "base/lambda.h" +#include "base/observer.h" +#include "ui/text/text_entity.h" #include "ui/widgets/shadow.h" +#include "ui/twidget.h" +#include "layerwidget.h" namespace Ui { class RoundButton; diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index b9e5e972a..a17636701 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp @@ -41,6 +41,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "apiwrap.h" #include "observer_peer.h" #include "auth_session.h" +#include +#include namespace { diff --git a/Telegram/SourceFiles/boxes/autolock_box.cpp b/Telegram/SourceFiles/boxes/autolock_box.cpp index c0a1d1af5..9c9f9b91a 100644 --- a/Telegram/SourceFiles/boxes/autolock_box.cpp +++ b/Telegram/SourceFiles/boxes/autolock_box.cpp @@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "ui/widgets/checkbox.h" #include "styles/style_boxes.h" - +#include "facades.h" void AutoLockBox::prepare() { setTitle(langFactory(lng_passcode_autolock)); diff --git a/Telegram/SourceFiles/boxes/change_phone_box.cpp b/Telegram/SourceFiles/boxes/change_phone_box.cpp index 8a2659f7c..6a52fe357 100644 --- a/Telegram/SourceFiles/boxes/change_phone_box.cpp +++ b/Telegram/SourceFiles/boxes/change_phone_box.cpp @@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "base/lambda_guard.h" #include "boxes/change_phone_box.h" - #include "lang/lang_keys.h" #include "styles/style_boxes.h" #include "ui/widgets/labels.h" @@ -28,6 +28,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/confirm_phone_box.h" #include "ui/toast/toast.h" #include "boxes/confirm_box.h" +#include "facades.h" +#include "app.h" // For formatPhone namespace { diff --git a/Telegram/SourceFiles/boxes/confirm_box.h b/Telegram/SourceFiles/boxes/confirm_box.h index fae83c0a3..09814fe7c 100644 --- a/Telegram/SourceFiles/boxes/confirm_box.h +++ b/Telegram/SourceFiles/boxes/confirm_box.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "boxes/abstract_box.h" +#include "history/history.h" namespace Ui { class Checkbox; diff --git a/Telegram/SourceFiles/boxes/download_path_box.cpp b/Telegram/SourceFiles/boxes/download_path_box.cpp index b2dfa61a4..ade2c5bd7 100644 --- a/Telegram/SourceFiles/boxes/download_path_box.cpp +++ b/Telegram/SourceFiles/boxes/download_path_box.cpp @@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "platform/platform_specific.h" #include "styles/style_boxes.h" +#include "facades.h" DownloadPathBox::DownloadPathBox(QWidget *parent) : _path(Global::DownloadPath()) diff --git a/Telegram/SourceFiles/boxes/edit_color_box.cpp b/Telegram/SourceFiles/boxes/edit_color_box.cpp index 741515072..35c4eb857 100644 --- a/Telegram/SourceFiles/boxes/edit_color_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_color_box.cpp @@ -25,6 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/shadow.h" #include "styles/style_mediaview.h" #include "ui/widgets/input_fields.h" +#include "app.h" class EditColorBox::Picker : public TWidget { public: diff --git a/Telegram/SourceFiles/boxes/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/edit_participant_box.cpp index 078ba142d..5f22a7f6e 100644 --- a/Telegram/SourceFiles/boxes/edit_participant_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_participant_box.cpp @@ -27,6 +27,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_boxes.h" #include "ui/special_buttons.h" #include "boxes/calendar_box.h" +#include "facades.h" +#include "app.h" // For App::peerName namespace { diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp index 16f40322b..5cdcb9649 100644 --- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "base/lambda_guard.h" #include "boxes/edit_privacy_box.h" #include "styles/style_boxes.h" @@ -29,6 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "apiwrap.h" #include "auth_session.h" #include "lang/lang_keys.h" +#include "app.h" // For App::user, App::feedUsers namespace { diff --git a/Telegram/SourceFiles/boxes/language_box.cpp b/Telegram/SourceFiles/boxes/language_box.cpp index 10225dd56..0ce1be712 100644 --- a/Telegram/SourceFiles/boxes/language_box.cpp +++ b/Telegram/SourceFiles/boxes/language_box.cpp @@ -19,7 +19,6 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "boxes/language_box.h" - #include "lang/lang_keys.h" #include "ui/widgets/checkbox.h" #include "ui/widgets/buttons.h" diff --git a/Telegram/SourceFiles/boxes/local_storage_box.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp index c6462715b..1b744616c 100644 --- a/Telegram/SourceFiles/boxes/local_storage_box.cpp +++ b/Telegram/SourceFiles/boxes/local_storage_box.cpp @@ -26,6 +26,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "mainwindow.h" #include "auth_session.h" +#include "facades.h" +#include "app.h" // For App::wnd +#include "layout.h" // For formatSizeText LocalStorageBox::LocalStorageBox(QWidget *parent) : _clear(this, lang(lng_local_storage_clear), st::boxLinkButton) { diff --git a/Telegram/SourceFiles/boxes/notifications_box.cpp b/Telegram/SourceFiles/boxes/notifications_box.cpp index a21080995..b30f464f2 100644 --- a/Telegram/SourceFiles/boxes/notifications_box.cpp +++ b/Telegram/SourceFiles/boxes/notifications_box.cpp @@ -32,6 +32,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "auth_session.h" #include "window/notifications_manager.h" #include "platform/platform_specific.h" +#include "app.h" // For App::pixmapFromImageInPlace namespace { diff --git a/Telegram/SourceFiles/boxes/notifications_box.h b/Telegram/SourceFiles/boxes/notifications_box.h index faadc2eca..1149ce481 100644 --- a/Telegram/SourceFiles/boxes/notifications_box.h +++ b/Telegram/SourceFiles/boxes/notifications_box.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "boxes/abstract_box.h" +#include "facades.h" namespace Ui { class LinkButton; diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp index 7b1dcb9b7..91494147e 100644 --- a/Telegram/SourceFiles/boxes/passcode_box.cpp +++ b/Telegram/SourceFiles/boxes/passcode_box.cpp @@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_boxes.h" #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" +#include "facades.h" PasscodeBox::PasscodeBox(QWidget*, bool turningOff) : _turningOff(turningOff) diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp index 9357c3ff4..60dbd798d 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.cpp +++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "base/algorithm.h" #include "boxes/peer_list_box.h" #include "styles/style_boxes.h" diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp index 23a7e2a55..2e30ff4d8 100644 --- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp +++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp @@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "base/algorithm.h" #include "boxes/peer_list_controllers.h" - #include "styles/style_boxes.h" #include "styles/style_profile.h" #include "boxes/confirm_box.h" diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.h b/Telegram/SourceFiles/boxes/peer_list_controllers.h index de0952580..14d2fbcd3 100644 --- a/Telegram/SourceFiles/boxes/peer_list_controllers.h +++ b/Telegram/SourceFiles/boxes/peer_list_controllers.h @@ -23,6 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/peer_list_box.h" #include "base/flat_set.h" #include "base/weak_unique_ptr.h" +#include "history/history.h" // Not used for now. // diff --git a/Telegram/SourceFiles/boxes/report_box.cpp b/Telegram/SourceFiles/boxes/report_box.cpp index 81b0a2cb8..7f599ceef 100644 --- a/Telegram/SourceFiles/boxes/report_box.cpp +++ b/Telegram/SourceFiles/boxes/report_box.cpp @@ -28,6 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" #include "mainwindow.h" +#include "facades.h" ReportBox::ReportBox(QWidget*, PeerData *peer) : _peer(peer) , _reasonGroup(std::make_shared>(Reason::Spam)) diff --git a/Telegram/SourceFiles/boxes/send_files_box.h b/Telegram/SourceFiles/boxes/send_files_box.h index 724b0689b..172d858a5 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.h +++ b/Telegram/SourceFiles/boxes/send_files_box.h @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/abstract_box.h" #include "storage/localimageloader.h" +#include "history/history_media.h" namespace Ui { class Checkbox; diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp index e74190107..5c1d25a3c 100644 --- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp +++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp @@ -34,6 +34,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/scroll_area.h" #include "auth_session.h" #include "messenger.h" +#include +#include namespace { diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp index 91bf8e122..32483679f 100644 --- a/Telegram/SourceFiles/boxes/username_box.cpp +++ b/Telegram/SourceFiles/boxes/username_box.cpp @@ -29,6 +29,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/toast/toast.h" #include "styles/style_boxes.h" #include "messenger.h" +#include +#include UsernameBox::UsernameBox(QWidget*) : _username(this, st::defaultInputField, [] { return qsl("@username"); }, App::self()->username, false) diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp index 380e03ef4..e1d2c6174 100644 --- a/Telegram/SourceFiles/calls/calls_box_controller.cpp +++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp @@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/ripple_animation.h" #include "calls/calls_instance.h" #include "history/history_media_types.h" +#include "app.h" namespace Calls { namespace { diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp index b9da6b0da..4738c3f3e 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp @@ -18,8 +18,9 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "calls/calls_call.h" +#include "core/utils.h" +#include "calls/calls_call.h" #include "auth_session.h" #include "mainwidget.h" #include "lang/lang_keys.h" diff --git a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h index 9fe4c7279..4596ed109 100644 --- a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h +++ b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include "settings.h" + namespace Calls { class Call; diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp index 9bb9447f8..194a3224a 100644 --- a/Telegram/SourceFiles/calls/calls_instance.cpp +++ b/Telegram/SourceFiles/calls/calls_instance.cpp @@ -18,6 +18,11 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ + +#include +#include +#include +#include #include "calls/calls_instance.h" #include "mtproto/connection.h" @@ -31,6 +36,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "media/media_audio_track.h" #include "boxes/rate_call_box.h" +#include "app.h" + namespace Calls { namespace { diff --git a/Telegram/SourceFiles/calls/calls_panel.cpp b/Telegram/SourceFiles/calls/calls_panel.cpp index 69c8e3b83..1ade7e41e 100644 --- a/Telegram/SourceFiles/calls/calls_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_panel.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "calls/calls_panel.h" #include "calls/calls_emoji_fingerprint.h" @@ -37,6 +38,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/platform_specific.h" #include "base/task_queue.h" #include "window/main_window.h" +#include "app.h" +#include namespace Calls { namespace { diff --git a/Telegram/SourceFiles/calls/calls_top_bar.cpp b/Telegram/SourceFiles/calls/calls_top_bar.cpp index af4084fe3..ae1f7c330 100644 --- a/Telegram/SourceFiles/calls/calls_top_bar.cpp +++ b/Telegram/SourceFiles/calls/calls_top_bar.cpp @@ -30,6 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "observer_peer.h" #include "boxes/abstract_box.h" #include "base/timer.h" +#include "app.h" namespace Calls { namespace { diff --git a/Telegram/SourceFiles/calls/calls_top_bar.h b/Telegram/SourceFiles/calls/calls_top_bar.h index 67d3e395b..bcc930304 100644 --- a/Telegram/SourceFiles/calls/calls_top_bar.h +++ b/Telegram/SourceFiles/calls/calls_top_bar.h @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "base/weak_unique_ptr.h" #include "base/timer.h" +#include "ui/twidget.h" namespace Ui { class IconButton; diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp index a1603aa1a..3752e9abe 100644 --- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp +++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp @@ -18,10 +18,13 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "chat_helpers/bot_keyboard.h" #include "styles/style_widgets.h" #include "styles/style_history.h" +#include "facades.h" +#include "app.h" BotKeyboard::BotKeyboard(QWidget *parent) : TWidget(parent) , _st(&st::botKbButton) { diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.h b/Telegram/SourceFiles/chat_helpers/bot_keyboard.h index 4ef072dd7..450779cff 100644 --- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.h +++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.h @@ -20,7 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "history/history_item.h" +#include "ui/twidget.h" #include "ui/widgets/tooltip.h" +#include "structs.h" + +class HistoryItem; class BotKeyboard : public TWidget, public Ui::AbstractTooltipShower, public ClickHandlerHost { Q_OBJECT diff --git a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp index ee8de0b8a..6339b51a4 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp @@ -24,6 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_chat_helpers.h" #include "ui/widgets/shadow.h" #include "lang/lang_keys.h" +#include "app.h" namespace ChatHelpers { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp index e2914d7b0..e2bfb3cad 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "chat_helpers/emoji_suggestions_widget.h" #include "chat_helpers/emoji_suggestions_helper.h" @@ -26,6 +27,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/platform_specific.h" #include "styles/style_chat_helpers.h" #include "ui/widgets/inner_dropdown.h" +#include "ui/emoji_config.h" +#include "app.h" namespace Ui { namespace Emoji { @@ -121,7 +124,7 @@ std::vector SuggestionsWidget::getRowsByQuery() const { suggestionsEmoji[i] = Find(QStringFromUTF16(suggestions[i].emoji())); } auto recents = 0; - auto &recent = GetRecent(); + auto &recent = GetRecent(); for (auto &item : recent) { auto emoji = item.first->original(); if (!emoji) emoji = item.first; diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h index 5fce90a30..3ba07972a 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h +++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.h @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "base/observer.h" +#include "ui/twidget.h" #include "ui/effects/panel_animation.h" namespace Ui { diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp index b7d156b2b..c385f7c50 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp @@ -29,6 +29,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_chat_helpers.h" #include "auth_session.h" #include "chat_helpers/stickers.h" +#include "app.h" +#include FieldAutocomplete::FieldAutocomplete(QWidget *parent) : TWidget(parent) , _scroll(this, st::mentionScroll) { diff --git a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h index 4712d4d8a..65bb88d90 100644 --- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.h +++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h @@ -20,7 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "base/observer.h" #include "ui/twidget.h" +#include "ui/animation.h" +#include "structs.h" namespace Ui { class ScrollArea; diff --git a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp index c427ca821..aaa648121 100644 --- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp @@ -31,6 +31,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "mainwindow.h" #include "window/window_controller.h" +#include "app.h" +#include namespace ChatHelpers { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp index f41ddbb6f..d5ae0eb7f 100644 --- a/Telegram/SourceFiles/chat_helpers/message_field.cpp +++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp @@ -18,6 +18,9 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include + #include "chat_helpers/message_field.h" #include "history/history_widget.h" diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp index b728e3986..82667e655 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp @@ -36,6 +36,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "auth_session.h" #include "observer_peer.h" #include "apiwrap.h" +#include "chat_helpers/tabbed_selector.h" +#include "app.h" + +#include +#include namespace ChatHelpers { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h index e993f5d1e..c1dd9eb38 100644 --- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h +++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "chat_helpers/tabbed_selector.h" #include "base/variant.h" +#include "ui/effects/ripple_animation.h" namespace Window { class Controller; diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp index b3703991a..9d2a54485 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "chat_helpers/tabbed_panel.h" #include "ui/widgets/shadow.h" @@ -25,6 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "chat_helpers/tabbed_selector.h" #include "window/window_controller.h" #include "mainwindow.h" +#include "app.h" namespace ChatHelpers { namespace { diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h index a7175b5c2..3347ea040 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.h +++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "ui/twidget.h" +#include "ui/animation.h" #include "base/timer.h" namespace Window { diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp index e3137c2dc..d800a25d8 100644 --- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp +++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp @@ -35,6 +35,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "observer_peer.h" #include "apiwrap.h" +#include "app.h" namespace ChatHelpers { namespace { diff --git a/Telegram/SourceFiles/codegen/common/cpp_file.cpp b/Telegram/SourceFiles/codegen/common/cpp_file.cpp index b5f8ff386..1b3bb499c 100644 --- a/Telegram/SourceFiles/codegen/common/cpp_file.cpp +++ b/Telegram/SourceFiles/codegen/common/cpp_file.cpp @@ -74,8 +74,11 @@ CppFile::CppFile(const QString &path, const ProjectInfo &project) } } -CppFile &CppFile::include(const QString &header) { - stream() << "#include \"" << header << "\""; +CppFile &CppFile::include(const QString &header, bool global ) { + if (global) + stream() << QString("#include <%1>").arg(header); + else + stream() << QString("#include \"%1\"").arg(header); return newline(); } @@ -129,4 +132,4 @@ bool CppFile::finalize() { } } // namespace common -} // namespace codegen \ No newline at end of file +} // namespace codegen diff --git a/Telegram/SourceFiles/codegen/common/cpp_file.h b/Telegram/SourceFiles/codegen/common/cpp_file.h index 0d90ba463..283bbb42a 100644 --- a/Telegram/SourceFiles/codegen/common/cpp_file.h +++ b/Telegram/SourceFiles/codegen/common/cpp_file.h @@ -48,7 +48,7 @@ public: stream() << "\n"; return *this; } - CppFile &include(const QString &header); + CppFile &include(const QString &header, bool global = false); // Empty name adds anonymous namespace. CppFile &pushNamespace(const QString &name = QString()); diff --git a/Telegram/SourceFiles/codegen/emoji/generator.cpp b/Telegram/SourceFiles/codegen/emoji/generator.cpp index 8ad15093a..bd530ebf3 100644 --- a/Telegram/SourceFiles/codegen/emoji/generator.cpp +++ b/Telegram/SourceFiles/codegen/emoji/generator.cpp @@ -318,6 +318,7 @@ bool Generator::writeImages() { bool Generator::writeSource() { source_ = std::make_unique(outputPath_ + ".cpp", project_); + source_->include("ui/emoji_config.h").newline(); source_->include("emoji_suggestions_data.h").newline(); source_->pushNamespace("Ui").pushNamespace("Emoji").pushNamespace(); source_->stream() << "\ @@ -379,6 +380,9 @@ void Init() {\n\ bool Generator::writeHeader() { auto header = std::make_unique(outputPath_ + ".h", project_); + + header->include("QChar", true); + header->include("settings.h"); header->pushNamespace("Ui").pushNamespace("Emoji").pushNamespace("internal"); header->stream() << "\ \n\ diff --git a/Telegram/SourceFiles/codegen/lang/generator.cpp b/Telegram/SourceFiles/codegen/lang/generator.cpp index 5ae39611b..c8cf983d5 100644 --- a/Telegram/SourceFiles/codegen/lang/generator.cpp +++ b/Telegram/SourceFiles/codegen/lang/generator.cpp @@ -115,6 +115,11 @@ Generator::Generator(const LangPack &langpack, const QString &destBasePath, cons bool Generator::writeHeader() { header_ = std::make_unique(basePath_ + ".h", project_); + + header_->include("utility", true); + header_->include("QString", true); + header_->include("QLatin1String", true); + header_->include("lang/lang_tag.h").newline().pushNamespace("Lang").stream() << "\ \n\ constexpr auto kTagsCount = " << langpack_.tags.size() << ";\n\ diff --git a/Telegram/SourceFiles/codegen/numbers/generator.cpp b/Telegram/SourceFiles/codegen/numbers/generator.cpp index 2e5558b8a..6cfea5765 100644 --- a/Telegram/SourceFiles/codegen/numbers/generator.cpp +++ b/Telegram/SourceFiles/codegen/numbers/generator.cpp @@ -39,6 +39,7 @@ Generator::Generator(const Rules &rules, const QString &destBasePath, const comm bool Generator::writeHeader() { header_ = std::make_unique(basePath_ + ".h", project_); + header_->include("QString", true); header_->stream() << "QVector phoneNumberParse(const QString &number);\n"; return header_->finalize(); @@ -47,6 +48,7 @@ bool Generator::writeHeader() { bool Generator::writeSource() { source_ = std::make_unique(basePath_ + ".cpp", project_); + source_->include("QVector", true); source_->stream() << "\ QVector phoneNumberParse(const QString &number) {\n\ QVector result;\n\ diff --git a/Telegram/SourceFiles/codegen/scheme/codegen_scheme.py b/Telegram/SourceFiles/codegen/scheme/codegen_scheme.py index 168607898..bf789f317 100644 --- a/Telegram/SourceFiles/codegen/scheme/codegen_scheme.py +++ b/Telegram/SourceFiles/codegen/scheme/codegen_scheme.py @@ -989,6 +989,7 @@ GNU General Public License for more details.\n\ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\ Copyright (c) 2014 John Preston, https://desktop.telegram.org\n\ */\n\ +#include "base/assertion.h"\n\ #include "scheme.h"\n\ \n\ // Creator proxy class definition\n\ diff --git a/Telegram/SourceFiles/codegen/style/generator.cpp b/Telegram/SourceFiles/codegen/style/generator.cpp index faef6aeaa..e5cb9e9ca 100644 --- a/Telegram/SourceFiles/codegen/style/generator.cpp +++ b/Telegram/SourceFiles/codegen/style/generator.cpp @@ -216,6 +216,7 @@ Generator::Generator(const structure::Module &module, const QString &destBasePat bool Generator::writeHeader() { header_ = std::make_unique(basePath_ + ".h", project_); + header_->include("styles/style_basic.h").newline(); header_->include("ui/style/style_core.h").newline(); if (!writeHeaderStyleNamespace()) { diff --git a/Telegram/SourceFiles/config.h.in b/Telegram/SourceFiles/config.h.in index 783ed1516..79865ec13 100644 --- a/Telegram/SourceFiles/config.h.in +++ b/Telegram/SourceFiles/config.h.in @@ -20,8 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#ifdef Q_OS_WIN +# include +#endif #include "core/version.h" #include "settings.h" +#include "core/utils.h" constexpr str_const AppName = "${KEPKA_APPNAME}"; @@ -142,6 +147,7 @@ inline bool isServiceUser(quint64 id) { } #ifdef Q_OS_WIN +#include inline const GUID &cGUID() { #ifndef OS_MAC_STORE static const GUID gGuid = { 0x87a94ab0, 0xe370, 0x4cde, { 0x98, 0xd3, 0xac, 0xc1, 0x10, 0xc5, 0x96, 0x7d } }; diff --git a/Telegram/SourceFiles/core/basic_types.h b/Telegram/SourceFiles/core/basic_types.h index 86cc0364f..461b68a63 100644 --- a/Telegram/SourceFiles/core/basic_types.h +++ b/Telegram/SourceFiles/core/basic_types.h @@ -24,15 +24,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include #include - +#include +#include +#include +#include #include "base/build_config.h" +#include "base/ordered_set.h" template using not_null = gsl::not_null; -#include "base/ordered_set.h" - -#include - #define qsl(s) QStringLiteral(s) #define qstr(s) QLatin1String(s, static_cast(sizeof(s)-1)) diff --git a/Telegram/SourceFiles/core/click_handler.cpp b/Telegram/SourceFiles/core/click_handler.cpp index 46e74f3c2..cba214d55 100644 --- a/Telegram/SourceFiles/core/click_handler.cpp +++ b/Telegram/SourceFiles/core/click_handler.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "ui/text/text_entity.h" #include "core/click_handler.h" ClickHandlerHost::~ClickHandlerHost() { diff --git a/Telegram/SourceFiles/core/click_handler.h b/Telegram/SourceFiles/core/click_handler.h index 734c98c79..c67a6f6e7 100644 --- a/Telegram/SourceFiles/core/click_handler.h +++ b/Telegram/SourceFiles/core/click_handler.h @@ -20,6 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include + +#include "core/utils.h" +#include "base/lambda.h" +#include "ui/text/text_entity.h" + class ClickHandler; using ClickHandlerPtr = QSharedPointer; @@ -42,7 +48,7 @@ protected: }; class EntityInText; -struct TextWithEntities; + class ClickHandler { public: virtual ~ClickHandler() { diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp index 0c47420ee..db18ffa8b 100644 --- a/Telegram/SourceFiles/core/click_handler_types.cpp +++ b/Telegram/SourceFiles/core/click_handler_types.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "core/click_handler_types.h" #include "lang/lang_keys.h" @@ -29,6 +30,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/localstorage.h" #include "ui/widgets/tooltip.h" #include "core/file_utilities.h" +#include "facades.h" + +#include "app.h" // App::userLoaded namespace { diff --git a/Telegram/SourceFiles/core/click_handler_types.h b/Telegram/SourceFiles/core/click_handler_types.h index fe8b82068..274abde78 100644 --- a/Telegram/SourceFiles/core/click_handler_types.h +++ b/Telegram/SourceFiles/core/click_handler_types.h @@ -20,7 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include #include "core/click_handler.h" +#include "structs.h" class TextClickHandler : public ClickHandler { public: diff --git a/Telegram/SourceFiles/core/file_utilities.cpp b/Telegram/SourceFiles/core/file_utilities.cpp index e96946bd8..4bfa85f3b 100644 --- a/Telegram/SourceFiles/core/file_utilities.cpp +++ b/Telegram/SourceFiles/core/file_utilities.cpp @@ -18,6 +18,9 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include +#include #include "core/file_utilities.h" #include "mainwindow.h" diff --git a/Telegram/SourceFiles/core/file_utilities.h b/Telegram/SourceFiles/core/file_utilities.h index 922021f3d..dc7fa92ca 100644 --- a/Telegram/SourceFiles/core/file_utilities.h +++ b/Telegram/SourceFiles/core/file_utilities.h @@ -20,6 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include +#include #include "base/observer.h" // legacy diff --git a/Telegram/SourceFiles/core/single_timer.h b/Telegram/SourceFiles/core/single_timer.h index 678c21b33..727bfc237 100644 --- a/Telegram/SourceFiles/core/single_timer.h +++ b/Telegram/SourceFiles/core/single_timer.h @@ -20,7 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include #include "core/basic_types.h" +#include "core/utils.h" + +#include class SingleTimer : public QTimer { // single shot timer with check Q_OBJECT diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp index 8a789e0b4..dc1c6e3c9 100644 --- a/Telegram/SourceFiles/core/utils.cpp +++ b/Telegram/SourceFiles/core/utils.cpp @@ -18,6 +18,9 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include +#include #include "core/utils.h" #include @@ -27,6 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include #include +#include extern "C" { #include @@ -47,6 +51,8 @@ quint64 _SharedMemoryLocation[4] = { 0x00, 0x01, 0x02, 0x03 }; #include +#include "mtproto/core_types.h" + // Base types compile-time check static_assert(sizeof(char) == 1, "Basic types size check failed"); static_assert(sizeof(uchar) == 1, "Basic types size check failed"); diff --git a/Telegram/SourceFiles/core/utils.h b/Telegram/SourceFiles/core/utils.h index bebadbb32..6c8005e84 100644 --- a/Telegram/SourceFiles/core/utils.h +++ b/Telegram/SourceFiles/core/utils.h @@ -20,8 +20,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include +#include +#include +#include +#include + +#include "base/assertion.h" #include "core/basic_types.h" #include "base/flags.h" +#include "logs.h" // Define specializations for QByteArray for Qt 5.3.2, because // QByteArray in Qt 5.3.2 doesn't declare "pointer" subtype. @@ -218,11 +229,11 @@ private: }; inline QString str_const_toString(const str_const &str) { - return QString::fromUtf8(str.c_str(), str.size()); + return QString::fromUtf8(str.c_str(), static_cast(str.size())); } inline QByteArray str_const_toByteArray(const str_const &str) { - return QByteArray::fromRawData(str.c_str(), str.size()); + return QByteArray::fromRawData(str.c_str(), static_cast(str.size())); } template diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 752d58f8c..662a9a9df 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include -// #include "core/utils.h" +#include "utils.h" #define BETA_VERSION_MACRO (0ULL) diff --git a/Telegram/SourceFiles/data/data_abstract_structure.cpp b/Telegram/SourceFiles/data/data_abstract_structure.cpp index d2278e185..a90dceff5 100644 --- a/Telegram/SourceFiles/data/data_abstract_structure.cpp +++ b/Telegram/SourceFiles/data/data_abstract_structure.cpp @@ -18,6 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "base/ordered_set.h" +#include "core/utils.h" #include "data/data_abstract_structure.h" namespace Data { diff --git a/Telegram/SourceFiles/data/data_drafts.h b/Telegram/SourceFiles/data/data_drafts.h index 336663f27..f49d4a5f5 100644 --- a/Telegram/SourceFiles/data/data_drafts.h +++ b/Telegram/SourceFiles/data/data_drafts.h @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "structs.h" +#include "history/history.h" + namespace Ui { class FlatTextarea; } // namespace Ui diff --git a/Telegram/SourceFiles/dialogs/dialogs_common.h b/Telegram/SourceFiles/dialogs/dialogs_common.h index f0f5b336d..6f6a3f974 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_common.h +++ b/Telegram/SourceFiles/dialogs/dialogs_common.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include + namespace Dialogs { class Row; diff --git a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp index 1c84fe4a9..c8f79afa7 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "history/history.h" #include "dialogs/dialogs_indexed_list.h" namespace Dialogs { diff --git a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h index d550c5859..7c50f6c8c 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h +++ b/Telegram/SourceFiles/dialogs/dialogs_indexed_list.h @@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "structs.h" #include "dialogs/dialogs_common.h" #include "dialogs/dialogs_list.h" diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp index a5f0cd287..c76b7a837 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp @@ -40,6 +40,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/window_controller.h" #include "ui/widgets/multi_select.h" +#include // memcmp + namespace { constexpr auto kHashtagResultsLimit = 5; diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h index 0ce5443d5..c736f62b7 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.h @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "dialogs/dialogs_widget.h" #include "base/flags.h" +#include "facades.h" namespace Dialogs { class Row; diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp index aaf9cc423..04590e3e1 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp @@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "app.h" #include "dialogs/dialogs_layout.h" - #include "data/data_abstract_structure.h" #include "data/data_drafts.h" #include "dialogs/dialogs_list.h" diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.h b/Telegram/SourceFiles/dialogs/dialogs_layout.h index 5770029a7..4db0bd8d0 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_layout.h +++ b/Telegram/SourceFiles/dialogs/dialogs_layout.h @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "ui/twidget.h" +#include "dialogs/dialogs_common.h" + namespace Dialogs { class Row; diff --git a/Telegram/SourceFiles/dialogs/dialogs_list.h b/Telegram/SourceFiles/dialogs/dialogs_list.h index b97a04c2f..577ad737c 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_list.h +++ b/Telegram/SourceFiles/dialogs/dialogs_list.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "structs.h" +#include "dialogs/dialogs_common.h" #include "dialogs/dialogs_row.h" class PeerData; diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp index 408129468..ad3914f44 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_search_from_controllers.cpp @@ -24,6 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "observer_peer.h" #include "auth_session.h" #include "apiwrap.h" +#include "app.h" namespace Dialogs { diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index 92823d213..a052212bd 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "dialogs/dialogs_widget.h" - #include "dialogs/dialogs_inner_widget.h" #include "dialogs/dialogs_search_from_controllers.h" #include "styles/style_dialogs.h" diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h index f7984ec36..fd2bc52b1 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.h +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h @@ -22,6 +22,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/section_widget.h" #include "ui/widgets/scroll_area.h" +#include "structs.h" +#include "dialogs/dialogs_common.h" class DialogsInner; @@ -55,6 +57,8 @@ enum DialogsSearchRequestType { DialogsSearchMigratedFromOffset, }; +class History; + class DialogsWidget : public Window::AbstractSectionWidget, public RPCSender { Q_OBJECT diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index aa91deacb..91d53f286 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -37,6 +37,8 @@ Q_DECLARE_METATYPE(ClickHandlerPtr); Q_DECLARE_METATYPE(Qt::MouseButton); Q_DECLARE_METATYPE(Ui::ShowWay); +// class PeerData; + namespace App { namespace internal { @@ -259,16 +261,42 @@ void showPeerProfile(const PeerId &peer) { } } +void showPeerProfile(const PeerData *peer) { + showPeerProfile(peer->id); +} + +void showPeerProfile(const History *history) { + showPeerProfile(history->peer->id); +} + void showPeerOverview(const PeerId &peer, MediaOverviewType type) { if (auto m = App::main()) { m->showMediaOverview(App::peer(peer), type); } } +void showPeerOverview(const PeerData *peer, MediaOverviewType type) { + showPeerOverview(peer->id, type); +} + +void showPeerOverview(const History *history, MediaOverviewType type) { + showPeerOverview(history->peer->id, type); +} + void showPeerHistory(const PeerId &peer, MsgId msgId, ShowWay way) { if (MainWidget *m = App::main()) m->ui_showPeerHistory(peer, msgId, way); } +void showPeerHistory(const PeerData *peer, MsgId msgId, ShowWay way) { + showPeerHistory(peer->id, msgId, way); +} +void showPeerHistory(const History *history, MsgId msgId, ShowWay way) { + showPeerHistory(history->peer->id, msgId, way); +} +void showPeerHistoryAtItem(const HistoryItem *item, ShowWay way) { + showPeerHistory(item->history()->peer->id, item->id, way); +} + void showPeerHistoryAsync(const PeerId &peer, MsgId msgId, ShowWay way) { if (MainWidget *m = App::main()) { qRegisterMetaType(); @@ -276,6 +304,14 @@ void showPeerHistoryAsync(const PeerId &peer, MsgId msgId, ShowWay way) { } } +void showChatsList() { + showPeerHistory(PeerId(0), 0, ShowWay::ClearStack); +} +void showChatsListAsync() { + showPeerHistoryAsync(PeerId(0), 0, ShowWay::ClearStack); +} + + PeerData *getPeerForMouseAction() { return Messenger::Instance().ui_getPeerForMouseAction(); } diff --git a/Telegram/SourceFiles/facades.h b/Telegram/SourceFiles/facades.h index dc27836cc..b44d78ab7 100644 --- a/Telegram/SourceFiles/facades.h +++ b/Telegram/SourceFiles/facades.h @@ -20,11 +20,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "base/type_traits.h" -#include "base/observer.h" +#include "base/lambda_guard.h" +#include "structs.h" +#include "history/history.h" // For MediaOverviewType ffs.. +class PeerData; class LayerWidget; class BoxContent; +class UserData; +class History; +class HistoryItem; namespace InlineBots { namespace Layout { @@ -108,20 +113,12 @@ void repaintHistoryItem(not_null item); void autoplayMediaInlineAsync(const FullMsgId &msgId); void showPeerProfile(const PeerId &peer); -inline void showPeerProfile(const PeerData *peer) { - showPeerProfile(peer->id); -} -inline void showPeerProfile(const History *history) { - showPeerProfile(history->peer->id); -} +void showPeerProfile(const PeerData *peer); +void showPeerProfile(const History *history); void showPeerOverview(const PeerId &peer, MediaOverviewType type); -inline void showPeerOverview(const PeerData *peer, MediaOverviewType type) { - showPeerOverview(peer->id, type); -} -inline void showPeerOverview(const History *history, MediaOverviewType type) { - showPeerOverview(history->peer->id, type); -} +void showPeerOverview(const PeerData *peer, MediaOverviewType type); +void showPeerOverview(const History *history, MediaOverviewType type); enum class ShowWay { ClearStack, @@ -129,22 +126,12 @@ enum class ShowWay { Backward, }; void showPeerHistory(const PeerId &peer, MsgId msgId, ShowWay way = ShowWay::ClearStack); -inline void showPeerHistory(const PeerData *peer, MsgId msgId, ShowWay way = ShowWay::ClearStack) { - showPeerHistory(peer->id, msgId, way); -} -inline void showPeerHistory(const History *history, MsgId msgId, ShowWay way = ShowWay::ClearStack) { - showPeerHistory(history->peer->id, msgId, way); -} -inline void showPeerHistoryAtItem(const HistoryItem *item, ShowWay way = ShowWay::ClearStack) { - showPeerHistory(item->history()->peer->id, item->id, way); -} +void showPeerHistory(const PeerData *peer, MsgId msgId, ShowWay way = ShowWay::ClearStack); +void showPeerHistory(const History *history, MsgId msgId, ShowWay way = ShowWay::ClearStack); +void showPeerHistoryAtItem(const HistoryItem *item, ShowWay way = ShowWay::ClearStack); void showPeerHistoryAsync(const PeerId &peer, MsgId msgId, ShowWay way = ShowWay::ClearStack); -inline void showChatsList() { - showPeerHistory(PeerId(0), 0, ShowWay::ClearStack); -} -inline void showChatsListAsync() { - showPeerHistoryAsync(PeerId(0), 0, ShowWay::ClearStack); -} +void showChatsList(); +void showChatsListAsync(); PeerData *getPeerForMouseAction(); bool skipPaintEvent(QWidget *widget, QPaintEvent *event); diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp index 507a9cd38..946e45305 100644 --- a/Telegram/SourceFiles/history/history.cpp +++ b/Telegram/SourceFiles/history/history.cpp @@ -19,23 +19,24 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "history/history.h" - -#include "history/history_message.h" -#include "history/history_media_types.h" -#include "history/history_service.h" -#include "dialogs/dialogs_indexed_list.h" -#include "styles/style_dialogs.h" -#include "data/data_drafts.h" -#include "lang/lang_keys.h" -#include "apiwrap.h" -#include "mainwidget.h" -#include "mainwindow.h" -#include "storage/localstorage.h" -#include "window/top_bar_widget.h" -#include "observer_peer.h" +#include "lang_auto.h" +#include "layout.h" +#include "history_message.h" +#include "history_media_types.h" +#include "facades.h" #include "auth_session.h" -#include "window/notifications_manager.h" +#include "data/data_drafts.h" +#include "app.h" +#include "mainwidget.h" +#include "styles/style_dialogs.h" +#include "apiwrap.h" +#include "history_service.h" +#include "observer_peer.h" #include "calls/calls_instance.h" +#include "messenger.h" +#include "dialogs/dialogs_indexed_list.h" +#include "dialogs/dialogs_row.h" +#include "storage/localstorage.h" namespace { diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h index 4b76c9d87..04bb75117 100644 --- a/Telegram/SourceFiles/history/history.h +++ b/Telegram/SourceFiles/history/history.h @@ -20,14 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "structs.h" -#include "dialogs/dialogs_common.h" -#include "ui/effects/send_action_animations.h" -#include "base/observer.h" +#include "ui/animation.h" // For BasicAnimation +#include "ui/effects/send_action_animations.h" // For SendActionAnimation +#include "dialogs/dialogs_common.h" // For Dialogs::Mode #include "base/timer.h" -#include "base/variant.h" +#include "base/optional.h" #include "base/flat_set.h" -#include "base/flags.h" void HistoryInit(); diff --git a/Telegram/SourceFiles/history/history_admin_log_filter.cpp b/Telegram/SourceFiles/history/history_admin_log_filter.cpp index df2b844b7..9386d0539 100644 --- a/Telegram/SourceFiles/history/history_admin_log_filter.cpp +++ b/Telegram/SourceFiles/history/history_admin_log_filter.cpp @@ -24,6 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/checkbox.h" #include "ui/effects/ripple_animation.h" #include "lang/lang_keys.h" +#include "app.h" namespace AdminLog { namespace { @@ -80,7 +81,7 @@ UserCheckbox::UserCheckbox(QWidget *parent, not_null user, bool check }); auto now = unixtime(); _statusText = App::onlineText(_user, now); - _statusOnline = App::onlineColorUse(_user, now); + _statusOnline = App::onlineColorUse(_user, now); auto checkSize = _check->getSize(); _checkRect = { QPoint(_st.margin.left(), (st::contactsPhotoSize - checkSize.height()) / 2), checkSize }; } diff --git a/Telegram/SourceFiles/history/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/history_admin_log_inner.cpp index 7cbc132f1..713f3d4a7 100644 --- a/Telegram/SourceFiles/history/history_admin_log_inner.cpp +++ b/Telegram/SourceFiles/history/history_admin_log_inner.cpp @@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "history/history_admin_log_item.h" #include "history/history_admin_log_inner.h" - #include "styles/style_history.h" #include "history/history_media_types.h" #include "history/history_message.h" @@ -38,6 +38,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "boxes/edit_participant_box.h" +#include +#include + namespace AdminLog { namespace { diff --git a/Telegram/SourceFiles/history/history_admin_log_inner.h b/Telegram/SourceFiles/history/history_admin_log_inner.h index 3b2cf3ba3..b4bfc29ea 100644 --- a/Telegram/SourceFiles/history/history_admin_log_inner.h +++ b/Telegram/SourceFiles/history/history_admin_log_inner.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include #include "history/history_admin_log_item.h" #include "history/history_admin_log_section.h" #include "ui/widgets/tooltip.h" diff --git a/Telegram/SourceFiles/history/history_admin_log_item.cpp b/Telegram/SourceFiles/history/history_admin_log_item.cpp index 5c6ec650c..663bc69f7 100644 --- a/Telegram/SourceFiles/history/history_admin_log_item.cpp +++ b/Telegram/SourceFiles/history/history_admin_log_item.cpp @@ -26,6 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "boxes/sticker_set_box.h" #include "messenger.h" +#include "app.h" namespace AdminLog { namespace { diff --git a/Telegram/SourceFiles/history/history_admin_log_item.h b/Telegram/SourceFiles/history/history_admin_log_item.h index d239d0cfd..ef7c71da9 100644 --- a/Telegram/SourceFiles/history/history_admin_log_item.h +++ b/Telegram/SourceFiles/history/history_admin_log_item.h @@ -20,6 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/lambda.h" +#include "core/basic_types.h" +#include "core/utils.h" +#include "history/history_item.h" + +class History; + namespace AdminLog { class HistoryItemOwned; diff --git a/Telegram/SourceFiles/history/history_drag_area.h b/Telegram/SourceFiles/history/history_drag_area.h index 875b41512..1637a2297 100644 --- a/Telegram/SourceFiles/history/history_drag_area.h +++ b/Telegram/SourceFiles/history/history_drag_area.h @@ -20,7 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "base/lambda.h" #include "ui/twidget.h" +#include "ui/animation.h" class DragArea : public TWidget { Q_OBJECT diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index 404137e5e..9cbaa86cb 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -18,8 +18,9 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include #include "history/history_inner_widget.h" - #include "styles/style_history.h" #include "core/file_utilities.h" #include "history/history_message.h" diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h index 2e8139586..52dab754d 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.h +++ b/Telegram/SourceFiles/history/history_inner_widget.h @@ -20,9 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include #include "ui/widgets/tooltip.h" #include "ui/widgets/scroll_area.h" #include "window/top_bar_widget.h" +#include "history/history.h" +#include "history/history_item.h" namespace Window { class Controller; diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 884e62116..007f33a43 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -18,8 +18,9 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include #include "history/history_item.h" - #include "lang/lang_keys.h" #include "mainwidget.h" #include "history/history_service_layout.h" diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h index 43567fce6..6ea830a56 100644 --- a/Telegram/SourceFiles/history/history_item.h +++ b/Telegram/SourceFiles/history/history_item.h @@ -20,8 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "history/history.h" +#include "ui/animation.h" +#include "ui/text/text.h" +#include "core/click_handler.h" #include "base/runtime_composer.h" #include "base/flags.h" +#include "structs.h" namespace Ui { class RippleAnimation; @@ -32,6 +37,8 @@ struct BotKeyboardButton; struct RippleAnimation; } // namespace style +class HistoryItem; + class HistoryElement { public: HistoryElement() = default; diff --git a/Telegram/SourceFiles/history/history_location_manager.cpp b/Telegram/SourceFiles/history/history_location_manager.cpp index 09f86942e..2e3bf2b52 100644 --- a/Telegram/SourceFiles/history/history_location_manager.cpp +++ b/Telegram/SourceFiles/history/history_location_manager.cpp @@ -18,6 +18,11 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include +#include +#include +#include #include "history/history_location_manager.h" #include "mainwidget.h" diff --git a/Telegram/SourceFiles/history/history_location_manager.h b/Telegram/SourceFiles/history/history_location_manager.h index b3098d7c3..6e630188f 100644 --- a/Telegram/SourceFiles/history/history_location_manager.h +++ b/Telegram/SourceFiles/history/history_location_manager.h @@ -20,6 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include +#include +#include "scheme.h" +#include "core/click_handler.h" +#include "ui/images.h" + void initLocationManager(); void reinitLocationManager(); void deinitLocationManager(); diff --git a/Telegram/SourceFiles/history/history_media.h b/Telegram/SourceFiles/history/history_media.h index ed5d7e348..684f19d5b 100644 --- a/Telegram/SourceFiles/history/history_media.h +++ b/Telegram/SourceFiles/history/history_media.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "history/history.h" +#include "history/history_item.h" + enum class MediaInBubbleState { None, Top, diff --git a/Telegram/SourceFiles/history/history_message.h b/Telegram/SourceFiles/history/history_message.h index b31c1feb2..902eec786 100644 --- a/Telegram/SourceFiles/history/history_message.h +++ b/Telegram/SourceFiles/history/history_message.h @@ -20,6 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/lambda.h" +#include "core/basic_types.h" +#include "scheme.h" +#include "structs.h" +#include "history/history.h" +#include "history/history_item.h" + void HistoryInitMessages(); base::lambda HistoryDependentItemCallback(const FullMsgId &msgId); MTPDmessage::Flags NewMessageFlags(not_null peer); diff --git a/Telegram/SourceFiles/history/history_service.h b/Telegram/SourceFiles/history/history_service.h index 2435e77c8..a4b053b65 100644 --- a/Telegram/SourceFiles/history/history_service.h +++ b/Telegram/SourceFiles/history/history_service.h @@ -20,6 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include "base/runtime_composer.h" +#include "core/click_handler.h" +#include "core/utils.h" +#include "structs.h" +#include "history/history_item.h" + struct HistoryServiceDependentData { MsgId msgId = 0; HistoryItem *msg = nullptr; diff --git a/Telegram/SourceFiles/history/history_service_layout.h b/Telegram/SourceFiles/history/history_service_layout.h index 67f3ff74f..7c32b418b 100644 --- a/Telegram/SourceFiles/history/history_service_layout.h +++ b/Telegram/SourceFiles/history/history_service_layout.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "core/basic_types.h" +#include "ui/twidget.h" +#include "ui/text/text.h" + class HistoryService; namespace HistoryLayout { diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index e3f127f78..7c77af655 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "history/history_widget.h" - #include "styles/style_history.h" #include "styles/style_dialogs.h" #include "styles/style_window.h" @@ -56,7 +56,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "mainwindow.h" #include "passcodewidget.h" -#include "mainwindow.h" #include "storage/file_upload.h" #include "media/media_audio.h" #include "media/media_audio_capture.h" @@ -74,7 +73,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/window_controller.h" #include "inline_bots/inline_results_widget.h" #include "chat_helpers/emoji_suggestions_widget.h" - +#include "facades.h" +#include "mainwindow.h" // Smart pointer for QObject*, has move semantics, destroys object if it doesn't have a parent. template class test_ptr { @@ -657,7 +657,7 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null cont connect(_field, SIGNAL(changed()), this, SLOT(onTextChange())); connect(_field, SIGNAL(spacedReturnedPasted()), this, SLOT(onPreviewParse())); connect(_field, SIGNAL(linksChanged()), this, SLOT(onPreviewCheck())); - connect(App::wnd()->windowHandle(), SIGNAL(visibleChanged(bool)), this, SLOT(onWindowVisibleChanged())); + connect(static_cast(App::wnd()->windowHandle()), SIGNAL(visibleChanged(bool)), this, SLOT(onWindowVisibleChanged())); connect(&_scrollTimer, SIGNAL(timeout()), this, SLOT(onScrollTimer())); connect(_tabbedSelector, SIGNAL(emojiSelected(EmojiPtr)), _field, SLOT(onEmojiInsert(EmojiPtr))); connect(_tabbedSelector, SIGNAL(stickerSelected(DocumentData*)), this, SLOT(onStickerSend(DocumentData*))); diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h index 27876285d..31a73d6ce 100644 --- a/Telegram/SourceFiles/history/history_widget.h +++ b/Telegram/SourceFiles/history/history_widget.h @@ -28,6 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/single_timer.h" #include "ui/widgets/input_fields.h" #include "base/flags.h" +#include "history/history_item.h" namespace InlineBots { namespace Layout { @@ -97,6 +98,7 @@ private: }; +class MainWidget; class HistoryHider : public TWidget, private base::Subscriber { Q_OBJECT diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp index 93bdeeebf..5537ba202 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp @@ -32,6 +32,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/localstorage.h" #include "auth_session.h" #include "lang/lang_keys.h" +#include "app.h" namespace InlineBots { namespace Layout { diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h index c3468c27f..69702781d 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h +++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h @@ -47,6 +47,8 @@ public: } }; +class ItemBase; + class Context { public: virtual void inlineItemLayoutChanged(const ItemBase *layout) = 0; diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_result.h b/Telegram/SourceFiles/inline_bots/inline_bot_result.h index 3838d8270..f3cf5cc9d 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_result.h +++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.h @@ -24,6 +24,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "structs.h" class FileLoader; +class History; +class LocationCoords; namespace InlineBots { diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp index 0db4ddda5..a72d33479 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp @@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "app.h" #include "inline_bots/inline_bot_send_data.h" - #include "inline_bots/inline_bot_result.h" #include "storage/localstorage.h" #include "lang/lang_keys.h" diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h index 4f9b4d493..beac1bc6c 100644 --- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h +++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.h @@ -23,7 +23,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/basic_types.h" #include "structs.h" #include "history/history_location_manager.h" +#include "mtproto/type_utils.h" +class History; namespace InlineBots { class Result; diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp index b36640565..104f93654 100644 --- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp +++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp @@ -19,7 +19,6 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "inline_bots/inline_results_widget.h" - #include "styles/style_chat_helpers.h" #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" @@ -38,6 +37,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/scroll_area.h" #include "ui/widgets/labels.h" #include "observer_peer.h" +#include +#include namespace InlineBots { namespace Layout { diff --git a/Telegram/SourceFiles/intro/introcode.cpp b/Telegram/SourceFiles/intro/introcode.cpp index 42d411e2c..bef634d6e 100644 --- a/Telegram/SourceFiles/intro/introcode.cpp +++ b/Telegram/SourceFiles/intro/introcode.cpp @@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "ui/widgets/labels.h" #include "styles/style_intro.h" +#include "app.h" // for formatPhone namespace Intro { diff --git a/Telegram/SourceFiles/intro/introphone.cpp b/Telegram/SourceFiles/intro/introphone.cpp index 0f4660e22..350743cde 100644 --- a/Telegram/SourceFiles/intro/introphone.cpp +++ b/Telegram/SourceFiles/intro/introphone.cpp @@ -30,6 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/click_handler_types.h" #include "boxes/confirm_box.h" #include "messenger.h" +#include "app.h" namespace Intro { diff --git a/Telegram/SourceFiles/intro/introsignup.cpp b/Telegram/SourceFiles/intro/introsignup.cpp index a655d52e5..0cbdf16a2 100644 --- a/Telegram/SourceFiles/intro/introsignup.cpp +++ b/Telegram/SourceFiles/intro/introsignup.cpp @@ -31,6 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/input_fields.h" #include "ui/widgets/labels.h" #include "ui/special_buttons.h" +#include "app.h" namespace Intro { diff --git a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp index a721de650..81d1e2ad9 100644 --- a/Telegram/SourceFiles/lang/lang_cloud_manager.cpp +++ b/Telegram/SourceFiles/lang/lang_cloud_manager.cpp @@ -29,6 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/confirm_box.h" #include "lang/lang_file_parser.h" #include "core/file_utilities.h" +#include "app.h" namespace Lang { diff --git a/Telegram/SourceFiles/lang/lang_cloud_manager.h b/Telegram/SourceFiles/lang/lang_cloud_manager.h index d272502e7..709272641 100644 --- a/Telegram/SourceFiles/lang/lang_cloud_manager.h +++ b/Telegram/SourceFiles/lang/lang_cloud_manager.h @@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/observer.h" #include "mtproto/sender.h" #include "base/weak_unique_ptr.h" diff --git a/Telegram/SourceFiles/lang/lang_file_parser.cpp b/Telegram/SourceFiles/lang/lang_file_parser.cpp index ed62ebdae..9950a2fb7 100644 --- a/Telegram/SourceFiles/lang/lang_file_parser.cpp +++ b/Telegram/SourceFiles/lang/lang_file_parser.cpp @@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "lang/lang_file_parser.h" - #include "base/parse_helper.h" namespace Lang { diff --git a/Telegram/SourceFiles/lang/lang_instance.h b/Telegram/SourceFiles/lang/lang_instance.h index 2bd5a001f..6202b818f 100644 --- a/Telegram/SourceFiles/lang/lang_instance.h +++ b/Telegram/SourceFiles/lang/lang_instance.h @@ -22,6 +22,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang_auto.h" #include "base/weak_unique_ptr.h" +#include "base/observer.h" +#include "core/basic_types.h" +#include "core/utils.h" +#include "scheme.h" namespace Lang { diff --git a/Telegram/SourceFiles/lang/lang_keys.cpp b/Telegram/SourceFiles/lang/lang_keys.cpp index 56c888af2..551cc72fc 100644 --- a/Telegram/SourceFiles/lang/lang_keys.cpp +++ b/Telegram/SourceFiles/lang/lang_keys.cpp @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "lang/lang_file_parser.h" +#include "ui/text/text.h" bool langFirstNameGoesSecond() { auto fullname = lang(lng_full_name__tagged); diff --git a/Telegram/SourceFiles/lang/lang_keys.h b/Telegram/SourceFiles/lang/lang_keys.h index 550224ecf..cbc130ba7 100644 --- a/Telegram/SourceFiles/lang/lang_keys.h +++ b/Telegram/SourceFiles/lang/lang_keys.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "base/lambda.h" #include "lang/lang_instance.h" inline QString lang(LangKey key) { diff --git a/Telegram/SourceFiles/lang/lang_tag.cpp b/Telegram/SourceFiles/lang/lang_tag.cpp index 4aaea1ca7..0d99f9680 100644 --- a/Telegram/SourceFiles/lang/lang_tag.cpp +++ b/Telegram/SourceFiles/lang/lang_tag.cpp @@ -19,8 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "lang/lang_tag.h" - #include "lang/lang_keys.h" +#include "ui/text/text.h" namespace Lang { namespace { diff --git a/Telegram/SourceFiles/lang/lang_tag.h b/Telegram/SourceFiles/lang/lang_tag.h index 2d1da2290..6aced425f 100644 --- a/Telegram/SourceFiles/lang/lang_tag.h +++ b/Telegram/SourceFiles/lang/lang_tag.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include + namespace Lang { constexpr auto kTagReplacementSize = 4; diff --git a/Telegram/SourceFiles/lang/lang_translator.h b/Telegram/SourceFiles/lang/lang_translator.h index b5938aec6..165e02ae2 100644 --- a/Telegram/SourceFiles/lang/lang_translator.h +++ b/Telegram/SourceFiles/lang/lang_translator.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include namespace Lang { class Translator : public QTranslator { diff --git a/Telegram/SourceFiles/layerwidget.h b/Telegram/SourceFiles/layerwidget.h index a516bdc4d..55cd4239f 100644 --- a/Telegram/SourceFiles/layerwidget.h +++ b/Telegram/SourceFiles/layerwidget.h @@ -20,6 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include + +#include "base/lambda.h" +#include "ui/twidget.h" +#include "ui/animation.h" +#include "structs.h" + +class BoxContent; + namespace Window { class MainMenu; class Controller; diff --git a/Telegram/SourceFiles/layout.h b/Telegram/SourceFiles/layout.h index 69b364ab9..75653ffa0 100644 --- a/Telegram/SourceFiles/layout.h +++ b/Telegram/SourceFiles/layout.h @@ -21,6 +21,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "base/runtime_composer.h" +#include "ui/text/text.h" +#include "history/history.h" +#include "history/history_item.h" +#include "ui/style/style_core_types.h" constexpr auto FullSelection = TextSelection { 0xFFFF, 0xFFFF }; diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index bec59927a..ad198e0a2 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include +#include #include "platform/platform_specific.h" #include "mtproto/connection.h" @@ -50,6 +51,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #endif // Q_OS_LINUX64 || Q_OS_LINUX32 #endif // !TDESKTOP_DISABLE_CRASH_REPORTS +#include "facades.h" enum LogDataType { LogDataMain, diff --git a/Telegram/SourceFiles/logs.h b/Telegram/SourceFiles/logs.h index 053cf5f77..ca1ae6da6 100644 --- a/Telegram/SourceFiles/logs.h +++ b/Telegram/SourceFiles/logs.h @@ -20,6 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include + +extern inline bool cDebug(); + class MTPlong; namespace Logs { diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp index 78ce491e1..791ec6ae6 100644 --- a/Telegram/SourceFiles/main.cpp +++ b/Telegram/SourceFiles/main.cpp @@ -19,7 +19,6 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "application.h" #include "platform/platform_specific.h" #include "storage/localstorage.h" diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 9ef246801..79f336f48 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -75,6 +75,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "calls/calls_instance.h" #include "calls/calls_top_bar.h" +#include +#include + namespace { constexpr auto kSaveFloatPlayerPositionTimeoutMs = TimeMs(1000); diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index 3471ab607..51105b200 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -24,6 +24,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "history/history_common.h" #include "core/single_timer.h" #include "base/weak_unique_ptr.h" +#include "history/history.h" +#include "app.h" +#include "facades.h" namespace Notify { struct PeerUpdate; diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index 3b6883458..8ce98eba2 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -55,6 +55,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "auth_session.h" #include "window/window_controller.h" +#include +#include +#include +#include +#include +#include +#include + namespace { // Code for testing languages is F7-F6-F7-F8 diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h index 3c790c69f..15e72f466 100644 --- a/Telegram/SourceFiles/mainwindow.h +++ b/Telegram/SourceFiles/mainwindow.h @@ -20,10 +20,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include +#include +#include +#include #include "platform/platform_specific.h" #include "platform/platform_main_window.h" #include "core/single_timer.h" +#include "ui/twidget.h" +#include "layerwidget.h" + class PasscodeWidget; class MainWidget; class LayerStackWidget; diff --git a/Telegram/SourceFiles/media/media_audio.cpp b/Telegram/SourceFiles/media/media_audio.cpp index 59797df7a..5e87d3f87 100644 --- a/Telegram/SourceFiles/media/media_audio.cpp +++ b/Telegram/SourceFiles/media/media_audio.cpp @@ -18,8 +18,12 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "media/media_audio.h" +#include +#include "app.h" +#include "facades.h" + +#include "media/media_audio.h" #include "media/media_audio_ffmpeg_loader.h" #include "media/media_child_ffmpeg_loader.h" #include "media/media_audio_loaders.h" diff --git a/Telegram/SourceFiles/media/media_audio.h b/Telegram/SourceFiles/media/media_audio.h index 0a8883e35..0dd68e6d7 100644 --- a/Telegram/SourceFiles/media/media_audio.h +++ b/Telegram/SourceFiles/media/media_audio.h @@ -20,7 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include "base/observer.h" #include "storage/localimageloader.h" +#include "ui/animation.h" struct VideoSoundData; struct VideoSoundPart; diff --git a/Telegram/SourceFiles/media/media_audio_capture.h b/Telegram/SourceFiles/media/media_audio_capture.h index ddd811f5e..febc86e1f 100644 --- a/Telegram/SourceFiles/media/media_audio_capture.h +++ b/Telegram/SourceFiles/media/media_audio_capture.h @@ -20,6 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include "structs.h" + struct AVFrame; namespace Media { diff --git a/Telegram/SourceFiles/media/media_audio_loader.h b/Telegram/SourceFiles/media/media_audio_loader.h index 3ec3f4009..ea0fa128d 100644 --- a/Telegram/SourceFiles/media/media_audio_loader.h +++ b/Telegram/SourceFiles/media/media_audio_loader.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "core/utils.h" +#include "ui/images.h" + namespace FFMpeg { struct AVPacketDataWrap; } // namespace FFMpeg diff --git a/Telegram/SourceFiles/media/media_audio_track.h b/Telegram/SourceFiles/media/media_audio_track.h index b60b3ed2c..4e412a053 100644 --- a/Telegram/SourceFiles/media/media_audio_track.h +++ b/Telegram/SourceFiles/media/media_audio_track.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "base/timer.h" +#include "ui/images.h" namespace Media { namespace Audio { diff --git a/Telegram/SourceFiles/media/media_child_ffmpeg_loader.h b/Telegram/SourceFiles/media/media_child_ffmpeg_loader.h index 51b9a7c66..81f7a54aa 100644 --- a/Telegram/SourceFiles/media/media_child_ffmpeg_loader.h +++ b/Telegram/SourceFiles/media/media_child_ffmpeg_loader.h @@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include #include "media/media_audio_loader.h" #include "media/media_audio.h" diff --git a/Telegram/SourceFiles/media/media_clip_implementation.cpp b/Telegram/SourceFiles/media/media_clip_implementation.cpp index 517530986..2d63c443c 100644 --- a/Telegram/SourceFiles/media/media_clip_implementation.cpp +++ b/Telegram/SourceFiles/media/media_clip_implementation.cpp @@ -18,6 +18,7 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "ui/images.h" #include "media/media_clip_implementation.h" namespace Media { diff --git a/Telegram/SourceFiles/media/media_clip_implementation.h b/Telegram/SourceFiles/media/media_clip_implementation.h index aee1f7878..f460d8424 100644 --- a/Telegram/SourceFiles/media/media_clip_implementation.h +++ b/Telegram/SourceFiles/media/media_clip_implementation.h @@ -20,6 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include +#include + class FileLocation; namespace Media { diff --git a/Telegram/SourceFiles/media/media_clip_qtgif.h b/Telegram/SourceFiles/media/media_clip_qtgif.h index 35a8ef6da..9cccdf2ea 100644 --- a/Telegram/SourceFiles/media/media_clip_qtgif.h +++ b/Telegram/SourceFiles/media/media_clip_qtgif.h @@ -19,6 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include #include "media/media_clip_implementation.h" diff --git a/Telegram/SourceFiles/media/media_clip_reader.cpp b/Telegram/SourceFiles/media/media_clip_reader.cpp index 410fa80e8..a2c112389 100644 --- a/Telegram/SourceFiles/media/media_clip_reader.cpp +++ b/Telegram/SourceFiles/media/media_clip_reader.cpp @@ -18,8 +18,8 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include #include "media/media_clip_reader.h" - #include "storage/file_download.h" extern "C" { diff --git a/Telegram/SourceFiles/media/media_clip_reader.h b/Telegram/SourceFiles/media/media_clip_reader.h index a0ed941e8..bc7c70e3e 100644 --- a/Telegram/SourceFiles/media/media_clip_reader.h +++ b/Telegram/SourceFiles/media/media_clip_reader.h @@ -21,6 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "storage/localimageloader.h" +#include "window/notifications_manager_default.h" +#include "ui/animation.h" class FileLocation; diff --git a/Telegram/SourceFiles/media/player/media_player_button.h b/Telegram/SourceFiles/media/player/media_player_button.h index 9670b9a01..cfbd65fce 100644 --- a/Telegram/SourceFiles/media/player/media_player_button.h +++ b/Telegram/SourceFiles/media/player/media_player_button.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "ui/abstract_button.h" +#include "ui/animation.h" #include "styles/style_media_player.h" namespace Media { diff --git a/Telegram/SourceFiles/media/player/media_player_cover.cpp b/Telegram/SourceFiles/media/player/media_player_cover.cpp index f2b53ca58..1ee5b98bb 100644 --- a/Telegram/SourceFiles/media/player/media_player_cover.cpp +++ b/Telegram/SourceFiles/media/player/media_player_cover.cpp @@ -18,8 +18,9 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "media/player/media_player_cover.h" +#include "facades.h" +#include "media/player/media_player_cover.h" #include "ui/widgets/labels.h" #include "ui/widgets/continuous_sliders.h" #include "ui/widgets/buttons.h" @@ -30,6 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "media/player/media_player_volume_controller.h" #include "styles/style_media_player.h" #include "styles/style_mediaview.h" +#include "layout.h" namespace Media { namespace Player { diff --git a/Telegram/SourceFiles/media/player/media_player_cover.h b/Telegram/SourceFiles/media/player/media_player_cover.h index 0b949076d..6d3b26284 100644 --- a/Telegram/SourceFiles/media/player/media_player_cover.h +++ b/Telegram/SourceFiles/media/player/media_player_cover.h @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/observer.h" +#include "ui/twidget.h" + class AudioMsgId; namespace Ui { diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp index 29e07e283..feed9cb2d 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.cpp +++ b/Telegram/SourceFiles/media/player/media_player_float.cpp @@ -18,14 +18,17 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include +#include "facades.h" #include "media/player/media_player_float.h" - #include "styles/style_media_player.h" #include "history/history_media.h" #include "media/media_clip_reader.h" #include "media/view/media_clip_playback.h" #include "media/media_audio.h" #include "styles/style_history.h" +#include "app.h" namespace Media { namespace Player { diff --git a/Telegram/SourceFiles/media/player/media_player_float.h b/Telegram/SourceFiles/media/player/media_player_float.h index 1cb9a89c9..af9ac5d84 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.h +++ b/Telegram/SourceFiles/media/player/media_player_float.h @@ -20,6 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/observer.h" +#include "ui/twidget.h" +#include "media/media_clip_reader.h" + +class HistoryItem; + namespace Media { namespace Clip { class Playback; diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp index 501f89c5c..22ef51451 100644 --- a/Telegram/SourceFiles/media/player/media_player_instance.cpp +++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp @@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "auth_session.h" #include "calls/calls_instance.h" #include "history/history_media.h" +#include "app.h" namespace Media { namespace Player { diff --git a/Telegram/SourceFiles/media/player/media_player_instance.h b/Telegram/SourceFiles/media/player/media_player_instance.h index 27936ac85..bce3511a7 100644 --- a/Telegram/SourceFiles/media/player/media_player_instance.h +++ b/Telegram/SourceFiles/media/player/media_player_instance.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/observer.h" +#include "structs.h" +#include "history/history.h" + namespace Notify { struct PeerUpdate; } // namespace Notify diff --git a/Telegram/SourceFiles/media/player/media_player_list.cpp b/Telegram/SourceFiles/media/player/media_player_list.cpp index fcc9e6155..b5c085bd7 100644 --- a/Telegram/SourceFiles/media/player/media_player_list.cpp +++ b/Telegram/SourceFiles/media/player/media_player_list.cpp @@ -18,8 +18,11 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include +#include "app.h" +#include "facades.h" #include "media/player/media_player_list.h" - #include "media/player/media_player_instance.h" #include "overview/overview_layout.h" #include "styles/style_media_player.h" diff --git a/Telegram/SourceFiles/media/player/media_player_list.h b/Telegram/SourceFiles/media/player/media_player_list.h index b2a6973c5..68fc3f1e9 100644 --- a/Telegram/SourceFiles/media/player/media_player_list.h +++ b/Telegram/SourceFiles/media/player/media_player_list.h @@ -20,6 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/observer.h" +#include "core/basic_types.h" +#include "ui/twidget.h" +#include "structs.h" + +class HistoryItem; + namespace Overview { namespace Layout { class Document; diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp index e1ae56037..6c8557cbe 100644 --- a/Telegram/SourceFiles/media/player/media_player_panel.cpp +++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp @@ -18,8 +18,11 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include "app.h" +#include "facades.h" +#include "ui/twidget.h" #include "media/player/media_player_panel.h" - #include "media/player/media_player_cover.h" #include "media/player/media_player_list.h" #include "media/player/media_player_instance.h" diff --git a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp index 8218e8e0e..017e682c2 100644 --- a/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp +++ b/Telegram/SourceFiles/media/player/media_player_volume_controller.cpp @@ -18,8 +18,11 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include "ui/twidget.h" +#include "app.h" +#include "facades.h" #include "media/player/media_player_volume_controller.h" - #include "media/media_audio.h" #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" diff --git a/Telegram/SourceFiles/media/player/media_player_widget.cpp b/Telegram/SourceFiles/media/player/media_player_widget.cpp index f5472dc8f..6df105a6a 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.cpp +++ b/Telegram/SourceFiles/media/player/media_player_widget.cpp @@ -18,8 +18,11 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include "ui/twidget.h" +#include "app.h" +#include "facades.h" #include "media/player/media_player_widget.h" - #include "ui/widgets/labels.h" #include "ui/widgets/continuous_sliders.h" #include "ui/widgets/shadow.h" diff --git a/Telegram/SourceFiles/media/player/media_player_widget.h b/Telegram/SourceFiles/media/player/media_player_widget.h index 4b57f0b50..151c3869c 100644 --- a/Telegram/SourceFiles/media/player/media_player_widget.h +++ b/Telegram/SourceFiles/media/player/media_player_widget.h @@ -19,6 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "structs.h" class AudioMsgId; diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.cpp b/Telegram/SourceFiles/media/view/media_clip_controller.cpp index b286e71f7..bcb31ea75 100644 --- a/Telegram/SourceFiles/media/view/media_clip_controller.cpp +++ b/Telegram/SourceFiles/media/view/media_clip_controller.cpp @@ -18,8 +18,11 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include "ui/twidget.h" +#include "app.h" +#include "facades.h" #include "media/view/media_clip_controller.h" - #include "media/view/media_clip_playback.h" #include "media/view/media_clip_volume_controller.h" #include "styles/style_mediaview.h" diff --git a/Telegram/SourceFiles/media/view/media_clip_playback.cpp b/Telegram/SourceFiles/media/view/media_clip_playback.cpp index 286c896dd..0936b9b02 100644 --- a/Telegram/SourceFiles/media/view/media_clip_playback.cpp +++ b/Telegram/SourceFiles/media/view/media_clip_playback.cpp @@ -19,7 +19,6 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "media/view/media_clip_playback.h" - #include "styles/style_mediaview.h" #include "media/media_audio.h" diff --git a/Telegram/SourceFiles/media/view/media_clip_playback.h b/Telegram/SourceFiles/media/view/media_clip_playback.h index b2ea741b7..4fee7c332 100644 --- a/Telegram/SourceFiles/media/view/media_clip_playback.h +++ b/Telegram/SourceFiles/media/view/media_clip_playback.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/lambda.h" +#include "ui/animation.h" #include "ui/widgets/continuous_sliders.h" namespace Media { diff --git a/Telegram/SourceFiles/media/view/media_clip_volume_controller.cpp b/Telegram/SourceFiles/media/view/media_clip_volume_controller.cpp index 97ed57223..25b7ef0ff 100644 --- a/Telegram/SourceFiles/media/view/media_clip_volume_controller.cpp +++ b/Telegram/SourceFiles/media/view/media_clip_volume_controller.cpp @@ -18,8 +18,12 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include +#include +#include "ui/twidget.h" +#include "app.h" +#include "facades.h" #include "media/view/media_clip_volume_controller.h" - #include "styles/style_mediaview.h" namespace Media { diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp index 16bc9e2f4..fc40d490c 100644 --- a/Telegram/SourceFiles/mediaview.cpp +++ b/Telegram/SourceFiles/mediaview.cpp @@ -42,6 +42,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/file_download.h" #include "calls/calls_instance.h" +#include +#include +#include +#include +#include +#include + namespace { TextParseOptions _captionTextOptions = { diff --git a/Telegram/SourceFiles/mediaview.h b/Telegram/SourceFiles/mediaview.h index 6efd50928..45a651960 100644 --- a/Telegram/SourceFiles/mediaview.h +++ b/Telegram/SourceFiles/mediaview.h @@ -22,6 +22,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/dropdown_menu.h" #include "ui/effects/radial_animation.h" +#include "core/click_handler.h" +#include "ui/images.h" +#include "structs.h" +#include "history/history.h" + +class PeerData; +class PhotoData; +class HistoryItem; +class AudioMsgId; namespace Media { namespace Player { diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index 10a69b58f..b61b3d012 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -52,6 +52,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/confirm_phone_box.h" #include "boxes/share_box.h" +#include +#include +#include +#include +#include +#include +#include + namespace { constexpr auto kQuitPreventTimeoutMs = 1500; diff --git a/Telegram/SourceFiles/messenger.h b/Telegram/SourceFiles/messenger.h index b0af99ae1..31eaa1d35 100644 --- a/Telegram/SourceFiles/messenger.h +++ b/Telegram/SourceFiles/messenger.h @@ -20,9 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include #include "base/observer.h" #include "mtproto/auth_key.h" #include "base/timer.h" +#include "mtproto/rpc_sender.h" +#include "structs.h" +#include "core/single_timer.h" namespace App { void quit(); @@ -59,6 +63,14 @@ class Translator; class CloudManager; } // namespace Lang + +class PhotoData; +class MainWindow; +class PhotoOpenClickHandler; +class HistoryItem; +class DocumentData; +class PeerData; + class Messenger final : public QObject, public RPCSender, private base::Subscriber { Q_OBJECT diff --git a/Telegram/SourceFiles/mtproto/auth_key.h b/Telegram/SourceFiles/mtproto/auth_key.h index 11e68c1ad..f7d5b72c0 100644 --- a/Telegram/SourceFiles/mtproto/auth_key.h +++ b/Telegram/SourceFiles/mtproto/auth_key.h @@ -23,6 +23,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include +#include +#include +#include "mtproto/core_types.h" +#include + namespace MTP { class AuthKey { diff --git a/Telegram/SourceFiles/mtproto/config_loader.cpp b/Telegram/SourceFiles/mtproto/config_loader.cpp index 1a019e1b4..e8c5d6fd4 100644 --- a/Telegram/SourceFiles/mtproto/config_loader.cpp +++ b/Telegram/SourceFiles/mtproto/config_loader.cpp @@ -24,6 +24,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/mtp_instance.h" #include "mtproto/special_config_request.h" +#include "facades.h" + namespace MTP { namespace internal { namespace { diff --git a/Telegram/SourceFiles/mtproto/connection.cpp b/Telegram/SourceFiles/mtproto/connection.cpp index 93ecadab7..d5dc562d1 100644 --- a/Telegram/SourceFiles/mtproto/connection.cpp +++ b/Telegram/SourceFiles/mtproto/connection.cpp @@ -19,11 +19,11 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "mtproto/connection.h" - #include "mtproto/rsa_public_key.h" #include "mtproto/rpc_sender.h" #include "mtproto/dc_options.h" #include "mtproto/connection_abstract.h" +#include "mtproto/facade.h" #include "zlib.h" #include "lang/lang_keys.h" #include "base/openssl_help.h" @@ -33,6 +33,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include #include +#include "facades.h" namespace MTP { namespace internal { @@ -2184,7 +2185,7 @@ void ConnectionPrivate::requestsAcked(const QVector &ids, bool byRespon } void ConnectionPrivate::handleMsgsStates(const QVector &ids, const QByteArray &states, QVector &acked) { - quint32 idsCount = ids.size(); + auto idsCount = ids.size(); if (!idsCount) { DEBUG_LOG(("Message Info: void ids vector in handleMsgsStates()")); return; diff --git a/Telegram/SourceFiles/mtproto/connection.h b/Telegram/SourceFiles/mtproto/connection.h index 40878829c..a59f853ce 100644 --- a/Telegram/SourceFiles/mtproto/connection.h +++ b/Telegram/SourceFiles/mtproto/connection.h @@ -20,9 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "mtproto/core_types.h" #include "mtproto/auth_key.h" #include "mtproto/dc_options.h" #include "core/single_timer.h" +#include "scheme.h" namespace MTP { @@ -199,7 +202,7 @@ private: DcType _dcType = DcType::Regular; mutable QReadWriteLock stateConnMutex; - qint32 _state = DisconnectedState; + qint32 _state = 0; bool _needSessionReset = false; void resetSession(); diff --git a/Telegram/SourceFiles/mtproto/connection_abstract.cpp b/Telegram/SourceFiles/mtproto/connection_abstract.cpp index 87d098496..730b018e6 100644 --- a/Telegram/SourceFiles/mtproto/connection_abstract.cpp +++ b/Telegram/SourceFiles/mtproto/connection_abstract.cpp @@ -24,6 +24,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/connection_http.h" #include "mtproto/connection_auto.h" +#include "facades.h" + namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/connection_auto.cpp b/Telegram/SourceFiles/mtproto/connection_auto.cpp index 6c9cfdb8f..cb9f2971c 100644 --- a/Telegram/SourceFiles/mtproto/connection_auto.cpp +++ b/Telegram/SourceFiles/mtproto/connection_auto.cpp @@ -19,9 +19,10 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "mtproto/connection_auto.h" - #include "mtproto/connection_http.h" +#include + namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/connection_auto.h b/Telegram/SourceFiles/mtproto/connection_auto.h index cc08a10ef..c5ab67bd1 100644 --- a/Telegram/SourceFiles/mtproto/connection_auto.h +++ b/Telegram/SourceFiles/mtproto/connection_auto.h @@ -22,6 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/connection_tcp.h" +#include +#include + namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/connection_http.cpp b/Telegram/SourceFiles/mtproto/connection_http.cpp index 0966978ac..958aaff7c 100644 --- a/Telegram/SourceFiles/mtproto/connection_http.cpp +++ b/Telegram/SourceFiles/mtproto/connection_http.cpp @@ -19,6 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "mtproto/connection_http.h" +#include "app.h" +#include namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/connection_http.h b/Telegram/SourceFiles/mtproto/connection_http.h index cb372d1fd..25686e555 100644 --- a/Telegram/SourceFiles/mtproto/connection_http.h +++ b/Telegram/SourceFiles/mtproto/connection_http.h @@ -22,6 +22,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/connection_abstract.h" +#include +#include + +class QNetworkReply; + namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/connection_tcp.cpp b/Telegram/SourceFiles/mtproto/connection_tcp.cpp index 906dfff7a..1878495ea 100644 --- a/Telegram/SourceFiles/mtproto/connection_tcp.cpp +++ b/Telegram/SourceFiles/mtproto/connection_tcp.cpp @@ -21,6 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/connection_tcp.h" #include +#include "app.h" +#include namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/connection_tcp.h b/Telegram/SourceFiles/mtproto/connection_tcp.h index 75cf3803a..9d6c11989 100644 --- a/Telegram/SourceFiles/mtproto/connection_tcp.h +++ b/Telegram/SourceFiles/mtproto/connection_tcp.h @@ -23,6 +23,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/auth_key.h" #include "mtproto/connection_abstract.h" +#include +#include +#include + namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/core_types.cpp b/Telegram/SourceFiles/mtproto/core_types.cpp index ef2de416d..f77f1910e 100644 --- a/Telegram/SourceFiles/mtproto/core_types.cpp +++ b/Telegram/SourceFiles/mtproto/core_types.cpp @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/core_types.h" #include "zlib.h" +#include "scheme.h" quint32 MTPstring::innerLength() const { quint32 l = v.length(); diff --git a/Telegram/SourceFiles/mtproto/core_types.h b/Telegram/SourceFiles/mtproto/core_types.h index 80314d5f5..a728641c4 100644 --- a/Telegram/SourceFiles/mtproto/core_types.h +++ b/Telegram/SourceFiles/mtproto/core_types.h @@ -20,9 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include #include "core/basic_types.h" #include "base/flags.h" -#include +#include "config.h" namespace MTP { diff --git a/Telegram/SourceFiles/mtproto/dc_options.cpp b/Telegram/SourceFiles/mtproto/dc_options.cpp index 0f89edf04..00893bb9f 100644 --- a/Telegram/SourceFiles/mtproto/dc_options.cpp +++ b/Telegram/SourceFiles/mtproto/dc_options.cpp @@ -22,6 +22,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/serialize_common.h" +#include "mtproto/facade.h" +#include "facades.h" + +#include + namespace MTP { class DcOptions::WriteLocker { diff --git a/Telegram/SourceFiles/mtproto/dc_options.h b/Telegram/SourceFiles/mtproto/dc_options.h index 67ab7ea39..1604882c8 100644 --- a/Telegram/SourceFiles/mtproto/dc_options.h +++ b/Telegram/SourceFiles/mtproto/dc_options.h @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "base/observer.h" #include "mtproto/rsa_public_key.h" +#include "scheme.h" #include #include #include diff --git a/Telegram/SourceFiles/mtproto/dcenter.h b/Telegram/SourceFiles/mtproto/dcenter.h index fa01645f7..42f77364a 100644 --- a/Telegram/SourceFiles/mtproto/dcenter.h +++ b/Telegram/SourceFiles/mtproto/dcenter.h @@ -20,6 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "mtproto/core_types.h" + +#include + +#include +#include +#include + namespace MTP { class Instance; @@ -32,7 +40,7 @@ class Dcenter : public QObject { Q_OBJECT public: - Dcenter(not_null instance, DcId dcId, AuthKeyPtr &&key); + Dcenter(gsl::not_null instance, DcId dcId, AuthKeyPtr &&key); QReadWriteLock *keyMutex() const; const AuthKeyPtr &getKey() const; @@ -59,7 +67,7 @@ private slots: private: mutable QReadWriteLock keyLock; mutable QMutex initLock; - not_null _instance; + gsl::not_null _instance; DcId _id = 0; AuthKeyPtr _key; bool _connectionInited = false; diff --git a/Telegram/SourceFiles/mtproto/mtp_instance.h b/Telegram/SourceFiles/mtproto/mtp_instance.h index 14725561d..6da883edd 100644 --- a/Telegram/SourceFiles/mtproto/mtp_instance.h +++ b/Telegram/SourceFiles/mtproto/mtp_instance.h @@ -22,6 +22,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include +#include +#include +#include +#include +#include "core/basic_types.h" +#include "mtproto/core_types.h" +#include "mtproto/rpc_sender.h" +#include "mtproto/connection.h" +#include "mtproto/session.h" namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/rpc_sender.h b/Telegram/SourceFiles/mtproto/rpc_sender.h index 62e2a3549..c43fe16e3 100644 --- a/Telegram/SourceFiles/mtproto/rpc_sender.h +++ b/Telegram/SourceFiles/mtproto/rpc_sender.h @@ -20,6 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include "base/lambda_guard.h" +#include "core/basic_types.h" +#include "core/utils.h" +#include "scheme.h" + class RPCError { public: RPCError(const MTPrpcError &error) : _code(error.c_rpc_error().verror_code.v) { diff --git a/Telegram/SourceFiles/mtproto/rsa_public_key.cpp b/Telegram/SourceFiles/mtproto/rsa_public_key.cpp index 1de58772d..37bfd2318 100644 --- a/Telegram/SourceFiles/mtproto/rsa_public_key.cpp +++ b/Telegram/SourceFiles/mtproto/rsa_public_key.cpp @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/rsa_public_key.h" #include "base/openssl_help.h" +#include "mtproto/core_types.h" #include #include #include diff --git a/Telegram/SourceFiles/mtproto/rsa_public_key.h b/Telegram/SourceFiles/mtproto/rsa_public_key.h index b96861c16..b3556052a 100644 --- a/Telegram/SourceFiles/mtproto/rsa_public_key.h +++ b/Telegram/SourceFiles/mtproto/rsa_public_key.h @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "core/utils.h" + namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/sender.h b/Telegram/SourceFiles/mtproto/sender.h index 11db35d9e..cf853cba8 100644 --- a/Telegram/SourceFiles/mtproto/sender.h +++ b/Telegram/SourceFiles/mtproto/sender.h @@ -20,7 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/lambda.h" #include "base/variant.h" +#include "mtproto/rpc_sender.h" +#include "facades.h" namespace MTP { diff --git a/Telegram/SourceFiles/mtproto/session.cpp b/Telegram/SourceFiles/mtproto/session.cpp index b0c9d2d0f..ebed2073e 100644 --- a/Telegram/SourceFiles/mtproto/session.cpp +++ b/Telegram/SourceFiles/mtproto/session.cpp @@ -19,10 +19,13 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "mtproto/session.h" +#include "mtproto/mtp_instance.h" #include "mtproto/connection.h" #include "mtproto/dcenter.h" #include "mtproto/auth_key.h" +#include "scheme.h" +#include "facade.h" namespace MTP { namespace internal { diff --git a/Telegram/SourceFiles/mtproto/special_config_request.cpp b/Telegram/SourceFiles/mtproto/special_config_request.cpp index 57222cc5c..3f0c2f272 100644 --- a/Telegram/SourceFiles/mtproto/special_config_request.cpp +++ b/Telegram/SourceFiles/mtproto/special_config_request.cpp @@ -25,6 +25,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mtproto/auth_key.h" #include "base/openssl_help.h" #include +#include "app.h" + +#include +#include +#include namespace MTP { namespace { diff --git a/Telegram/SourceFiles/mtproto/special_config_request.h b/Telegram/SourceFiles/mtproto/special_config_request.h index 47253a48b..16395e266 100644 --- a/Telegram/SourceFiles/mtproto/special_config_request.h +++ b/Telegram/SourceFiles/mtproto/special_config_request.h @@ -20,6 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/lambda.h" + +#include +#include +#include "mtproto/mtp_instance.h" + namespace MTP { class SpecialConfigRequest : public QObject { diff --git a/Telegram/SourceFiles/observer_peer.cpp b/Telegram/SourceFiles/observer_peer.cpp index 51455bf6c..bdaed0373 100644 --- a/Telegram/SourceFiles/observer_peer.cpp +++ b/Telegram/SourceFiles/observer_peer.cpp @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "observer_peer.h" #include "base/observer.h" +#include "facades.h" namespace Notify { namespace { diff --git a/Telegram/SourceFiles/observer_peer.h b/Telegram/SourceFiles/observer_peer.h index 08233cf41..3c47ad04b 100644 --- a/Telegram/SourceFiles/observer_peer.h +++ b/Telegram/SourceFiles/observer_peer.h @@ -23,6 +23,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "base/observer.h" #include "base/flags.h" +#include "structs.h" +#include "history/history.h" + namespace Notify { // Generic notifications about updates of some PeerData. diff --git a/Telegram/SourceFiles/passcodewidget.cpp b/Telegram/SourceFiles/passcodewidget.cpp index eb123c5df..e5c130771 100644 --- a/Telegram/SourceFiles/passcodewidget.cpp +++ b/Telegram/SourceFiles/passcodewidget.cpp @@ -31,6 +31,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/window_slide_animation.h" #include "window/window_controller.h" #include "auth_session.h" +#include "base/observer.h" +#include "app.h" + +#include PasscodeWidget::PasscodeWidget(QWidget *parent) : TWidget(parent) , _passcode(this, st::passcodeInput, langFactory(lng_passcode_ph)) diff --git a/Telegram/SourceFiles/passcodewidget.h b/Telegram/SourceFiles/passcodewidget.h index c68bb4b5c..ad4a049aa 100644 --- a/Telegram/SourceFiles/passcodewidget.h +++ b/Telegram/SourceFiles/passcodewidget.h @@ -20,6 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include "base/object_ptr.h" +#include "ui/animation.h" +#include "ui/twidget.h" + namespace Ui { class PasswordInput; class LinkButton; diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp index b5622aded..ac5c81458 100644 --- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp @@ -20,12 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "platform/linux/file_utilities_linux.h" -#include +// #include #include "platform/linux/linux_libs.h" #include "platform/linux/linux_gdk_helper.h" #include "messenger.h" #include "mainwindow.h" #include "storage/localstorage.h" +#include "facades.h" + +#include QStringList qt_make_filter_list(const QString &filter); diff --git a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp b/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp index 16879097c..1b9d1f973 100644 --- a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp @@ -19,9 +19,12 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "platform/linux/linux_desktop_environment.h" +#include "logs.h" #include +#define qstr QString // to avoid #include bloat utils.h + namespace Platform { namespace DesktopEnvironment { namespace { @@ -42,7 +45,7 @@ Type Compute() { if (list.contains("unity")) { // gnome-fallback sessions set XDG_CURRENT_DESKTOP to Unity // DESKTOP_SESSION can be gnome-fallback or gnome-fallback-compiz - if (desktopSession.indexOf(qstr("gnome-fallback")) >= 0) { + if (desktopSession.indexOf(QString("gnome-fallback")) >= 0) { return Type::Gnome; } return Type::Unity; @@ -53,7 +56,7 @@ Type Compute() { } else if (list.contains("gnome")) { return Type::Gnome; } else if (list.contains("kde")) { - if (kdeSession == qstr("5")) { + if (kdeSession == QString("5")) { return Type::KDE5; } return Type::KDE4; diff --git a/Telegram/SourceFiles/platform/linux/linux_libnotify.cpp b/Telegram/SourceFiles/platform/linux/linux_libnotify.cpp index 9e69a1224..422cc85c3 100644 --- a/Telegram/SourceFiles/platform/linux/linux_libnotify.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_libnotify.cpp @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "platform/linux/linux_libnotify.h" +#include "logs.h" + #include "platform/linux/linux_libs.h" namespace Platform { diff --git a/Telegram/SourceFiles/platform/linux/linux_libs.h b/Telegram/SourceFiles/platform/linux/linux_libs.h index 28f5ffd6c..f4ea4148e 100644 --- a/Telegram/SourceFiles/platform/linux/linux_libs.h +++ b/Telegram/SourceFiles/platform/linux/linux_libs.h @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include + +#include "logs.h" namespace Platform { namespace Libs { diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp index 00f1258c8..1ace31ec6 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -29,6 +29,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "application.h" #include "lang/lang_keys.h" #include "storage/localstorage.h" +#include "app.h" +#include "facades.h" namespace Platform { namespace { diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h index 56cc4977e..45fe7adce 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.h +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h @@ -22,6 +22,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/platform_main_window.h" +#include + +class QSystemTrayIcon; +class QMenu; + namespace Platform { class MainWindow : public Window::MainWindow { diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index 4fd01bb6d..ab950157e 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -35,6 +35,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include +#include +#include +#include + #include using namespace Platform; diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.h b/Telegram/SourceFiles/platform/linux/specific_linux.h index 42647cef6..fa8561958 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.h +++ b/Telegram/SourceFiles/platform/linux/specific_linux.h @@ -17,9 +17,20 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/timer.h" // TimeMs + #include #include +#include +#include + +class QWidget; +class QPainter; +class QPaintEvent; +class QAbstractNativeEventFilter; +class LocationCoords; + namespace Platform { inline void SetWatchingMediaKeys(bool watching) { @@ -42,7 +53,7 @@ QString CurrentExecutablePath(int argc, char *argv[]); } // namespace Platform inline QString psServerPrefix() { - return qsl("/tmp/"); + return QStringLiteral("/tmp/"); } inline void psCheckLocalSocket(const QString &serverName) { QFile address(serverName); diff --git a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm index 4b8149c33..24b0fce4f 100644 --- a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm +++ b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm @@ -18,15 +18,16 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/mac/file_utilities_mac.h" - #include "platform/mac/mac_utilities.h" #include "styles/style_window.h" #include #include +#include +#include + namespace { using namespace Platform; diff --git a/Telegram/SourceFiles/platform/mac/mac_utilities.mm b/Telegram/SourceFiles/platform/mac/mac_utilities.mm index 0106f3b97..020fed534 100644 --- a/Telegram/SourceFiles/platform/mac/mac_utilities.mm +++ b/Telegram/SourceFiles/platform/mac/mac_utilities.mm @@ -15,5 +15,4 @@ GNU General Public License for more details. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/mac/mac_utilities.h" diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h index cf5d99e1c..22d7daaa4 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.h +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h @@ -24,6 +24,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/mac/specific_mac_p.h" #include "base/timer.h" +#include +#include +#include + namespace Platform { class MainWindow : public Window::MainWindow { diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 8d3b9ec29..a9aef69ad 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -15,7 +15,6 @@ GNU General Public License for more details. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/mac/main_window_mac.h" #include "styles/style_window.h" diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm index 66b1cfd3d..7293ed365 100644 --- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm +++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm @@ -18,7 +18,6 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/mac/notifications_manager_mac.h" #include "platform/platform_specific.h" @@ -27,6 +26,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "base/task_queue.h" #include "base/variant.h" +#include "facades.h" +#include "history/history.h" #include #include diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.h b/Telegram/SourceFiles/platform/mac/specific_mac.h index 11e64d268..433843dc7 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac.h +++ b/Telegram/SourceFiles/platform/mac/specific_mac.h @@ -18,6 +18,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "platform/mac/specific_mac_p.h" +#include "core/utils.h" // TimeMs +#include "core/basic_types.h" // qsl() +#include + +class QAbstractNativeEventFilter; +class LocationCoords; namespace Platform { diff --git a/Telegram/SourceFiles/platform/mac/specific_mac.mm b/Telegram/SourceFiles/platform/mac/specific_mac.mm index e7b6e1a32..e3d336b5b 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac.mm @@ -15,7 +15,6 @@ GNU General Public License for more details. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/mac/specific_mac.h" #include @@ -40,6 +39,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include +#include +#include +#include + namespace { QStringList _initLogs; diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.h b/Telegram/SourceFiles/platform/mac/specific_mac_p.h index 24b1531b4..45e8a8ca4 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.h +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.h @@ -17,6 +17,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "core/utils.h" // TimeMs +#include +#include +#include // WId + // e is NSEvent* bool objc_handleMediaKeyEvent(void *e); diff --git a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm index f6978c328..55f483c81 100644 --- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm +++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm @@ -15,7 +15,6 @@ GNU General Public License for more details. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/mac/specific_mac_p.h" #include "mainwindow.h" diff --git a/Telegram/SourceFiles/platform/mac/window_title_mac.mm b/Telegram/SourceFiles/platform/mac/window_title_mac.mm index 58d5e7bc3..d1b02eb36 100644 --- a/Telegram/SourceFiles/platform/mac/window_title_mac.mm +++ b/Telegram/SourceFiles/platform/mac/window_title_mac.mm @@ -18,7 +18,6 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/mac/window_title_mac.h" #include "mainwindow.h" @@ -26,6 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_window.h" #include "styles/style_mediaview.h" #include "platform/platform_main_window.h" +#include "facades.h" +#include "app.h" #include #include diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h index 359b0476a..e735afed7 100644 --- a/Telegram/SourceFiles/platform/platform_specific.h +++ b/Telegram/SourceFiles/platform/platform_specific.h @@ -20,6 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include + +class QPaintEvent; + namespace Platform { void start(); diff --git a/Telegram/SourceFiles/platform/win/audio_win.cpp b/Telegram/SourceFiles/platform/win/audio_win.cpp index 4f6d127e4..249f48029 100644 --- a/Telegram/SourceFiles/platform/win/audio_win.cpp +++ b/Telegram/SourceFiles/platform/win/audio_win.cpp @@ -18,12 +18,12 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" - #include "platform/win/audio_win.h" #include "platform/win/windows_dlls.h" #include "media/media_audio.h" +#include +#include // Microsoft::WRL::ComPtr using namespace Microsoft::WRL; diff --git a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp index 9eb880ec8..7528dc238 100644 --- a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp +++ b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp @@ -18,8 +18,16 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" +#include +#include #include + +#include +#include +#include +#include +#include + #include "platform/win/file_utilities_win.h" #include "mainwindow.h" @@ -27,6 +35,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/win/windows_dlls.h" #include "lang/lang_keys.h" #include "messenger.h" +#include "app.h" +#include +#include HBITMAP qt_pixmapToWinHBITMAP(const QPixmap &, int hbitmapFormat); diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp index 9527f8db7..46f3229db 100644 --- a/Telegram/SourceFiles/platform/win/main_window_win.cpp +++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp @@ -18,7 +18,6 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/win/main_window_win.h" #include "styles/style_window.h" @@ -32,6 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/localstorage.h" #include "ui/widgets/popup_menu.h" #include "window/themes/window_theme.h" +#include "app.h" #include @@ -41,6 +41,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #undef min #undef max +#include +#include +#include +#include + +#include +#include +#include +#include "facades.h" + HICON qt_pixmapToWinHICON(const QPixmap &); using namespace Microsoft::WRL; diff --git a/Telegram/SourceFiles/platform/win/main_window_win.h b/Telegram/SourceFiles/platform/win/main_window_win.h index 28cfcef37..bb27cafe2 100644 --- a/Telegram/SourceFiles/platform/win/main_window_win.h +++ b/Telegram/SourceFiles/platform/win/main_window_win.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include #include "platform/platform_main_window.h" #include "base/flags.h" #include diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp index 0c4f0eb02..1a426dc69 100644 --- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp +++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp @@ -18,7 +18,6 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/win/notifications_manager_win.h" #include "window/notifications_utilities.h" @@ -31,6 +30,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include +#include +#include +#include +#include + +#include "history/history.h" +#include "app.h" +#include "facades.h" + HICON qt_pixmapToWinHICON(const QPixmap &); using namespace Microsoft::WRL; diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp index 89f65e11c..e28d6a657 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.cpp +++ b/Telegram/SourceFiles/platform/win/specific_win.cpp @@ -18,7 +18,6 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/win/specific_win.h" #include "platform/win/main_window_win.h" @@ -43,7 +42,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include +#include +#include +#include + #include +#include +#include +#include + #ifndef DCX_USESTYLE #define DCX_USESTYLE 0x00010000 @@ -56,8 +63,6 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #endif using namespace Microsoft::WRL; -using namespace ABI::Windows::UI::Notifications; -using namespace ABI::Windows::Data::Xml::Dom; using namespace Windows::Foundation; using namespace Platform; diff --git a/Telegram/SourceFiles/platform/win/specific_win.h b/Telegram/SourceFiles/platform/win/specific_win.h index fadb0b1ad..8f401b0cd 100644 --- a/Telegram/SourceFiles/platform/win/specific_win.h +++ b/Telegram/SourceFiles/platform/win/specific_win.h @@ -20,8 +20,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include #include +#include "core/basic_types.h" +#include "core/utils.h" + +#include "history/history_location_manager.h" + namespace Platform { inline void SetWatchingMediaKeys(bool watching) { @@ -96,6 +104,7 @@ QAbstractNativeEventFilter *psNativeEventFilter(); void psNewVersion(); +class TWidget; void psUpdateOverlayed(TWidget *widget); inline QByteArray psDownloadPathBookmark(const QString &path) { return QByteArray(); diff --git a/Telegram/SourceFiles/platform/win/window_title_win.cpp b/Telegram/SourceFiles/platform/win/window_title_win.cpp index 51cd75d8c..fcbd6f309 100644 --- a/Telegram/SourceFiles/platform/win/window_title_win.cpp +++ b/Telegram/SourceFiles/platform/win/window_title_win.cpp @@ -18,13 +18,14 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/win/window_title_win.h" #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" #include "styles/style_window.h" +#include + namespace Platform { TitleWidget::TitleWidget(QWidget *parent) : Window::TitleWidget(parent) diff --git a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp index b208018a0..dff3d642d 100644 --- a/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp +++ b/Telegram/SourceFiles/platform/win/windows_app_user_model_id.cpp @@ -18,13 +18,18 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" +#include "settings.h" #include "platform/win/windows_app_user_model_id.h" #include "platform/win/windows_dlls.h" #include #include +#include + +#include +#include + using namespace Microsoft::WRL; namespace Platform { diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.cpp b/Telegram/SourceFiles/platform/win/windows_dlls.cpp index 44e0f4259..50883f0e9 100644 --- a/Telegram/SourceFiles/platform/win/windows_dlls.cpp +++ b/Telegram/SourceFiles/platform/win/windows_dlls.cpp @@ -18,8 +18,10 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/win/windows_dlls.h" +#include "settings.h" + +#include namespace Platform { namespace Dlls { diff --git a/Telegram/SourceFiles/platform/win/windows_dlls.h b/Telegram/SourceFiles/platform/win/windows_dlls.h index 867bbc3cb..b50908d04 100644 --- a/Telegram/SourceFiles/platform/win/windows_dlls.h +++ b/Telegram/SourceFiles/platform/win/windows_dlls.h @@ -19,7 +19,10 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once - +#include // all stuff like FAR, BOOL, STDCALL, etc +#include // OPENASINFO +#include // IEnumAssocHandlers +#include namespace Platform { namespace Dlls { diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp index fc4d488df..5baaae6f9 100644 --- a/Telegram/SourceFiles/platform/win/windows_event_filter.cpp +++ b/Telegram/SourceFiles/platform/win/windows_event_filter.cpp @@ -18,11 +18,14 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "stdafx.h" #include "platform/win/windows_event_filter.h" +#include + #include "mainwindow.h" #include "auth_session.h" +#include "app.h" +#include "facades.h" namespace Platform { namespace { diff --git a/Telegram/SourceFiles/platform/win/windows_event_filter.h b/Telegram/SourceFiles/platform/win/windows_event_filter.h index 9a3c01c6c..f954fbe45 100644 --- a/Telegram/SourceFiles/platform/win/windows_event_filter.h +++ b/Telegram/SourceFiles/platform/win/windows_event_filter.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include +#include namespace Platform { diff --git a/Telegram/SourceFiles/profile/profile_back_button.cpp b/Telegram/SourceFiles/profile/profile_back_button.cpp index 9293a388d..0bba1da32 100644 --- a/Telegram/SourceFiles/profile/profile_back_button.cpp +++ b/Telegram/SourceFiles/profile/profile_back_button.cpp @@ -24,6 +24,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_widgets.h" #include "styles/style_window.h" #include "styles/style_profile.h" +#include "facades.h" + +#include namespace Profile { diff --git a/Telegram/SourceFiles/profile/profile_back_button.h b/Telegram/SourceFiles/profile/profile_back_button.h index c50cdde3b..3a66f8a67 100644 --- a/Telegram/SourceFiles/profile/profile_back_button.h +++ b/Telegram/SourceFiles/profile/profile_back_button.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "ui/abstract_button.h" +#include "base/observer.h" namespace Profile { diff --git a/Telegram/SourceFiles/profile/profile_block_channel_members.h b/Telegram/SourceFiles/profile/profile_block_channel_members.h index 0bc23187b..50d1a273e 100644 --- a/Telegram/SourceFiles/profile/profile_block_channel_members.h +++ b/Telegram/SourceFiles/profile/profile_block_channel_members.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "profile/profile_block_widget.h" +#include "base/object_ptr.h" namespace Ui { class LeftOutlineButton; diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.h b/Telegram/SourceFiles/profile/profile_block_group_members.h index 4710bd460..d5fe39c37 100644 --- a/Telegram/SourceFiles/profile/profile_block_group_members.h +++ b/Telegram/SourceFiles/profile/profile_block_group_members.h @@ -21,6 +21,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "profile/profile_block_peer_list.h" +#include "core/click_handler.h" +#include "QTimer" +#include "structs.h" + +class UserData; +class ChannelData; +class ChatData; namespace Ui { class FlatLabel; diff --git a/Telegram/SourceFiles/profile/profile_block_info.h b/Telegram/SourceFiles/profile/profile_block_info.h index 8873c13d5..77d881038 100644 --- a/Telegram/SourceFiles/profile/profile_block_info.h +++ b/Telegram/SourceFiles/profile/profile_block_info.h @@ -21,6 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "profile/profile_block_widget.h" +#include "ui/text/text_entity.h" +#include "mtproto/rpc_sender.h" namespace style { struct FlatLabel; diff --git a/Telegram/SourceFiles/profile/profile_block_invite_link.cpp b/Telegram/SourceFiles/profile/profile_block_invite_link.cpp index 12bc7a20b..3a103b271 100644 --- a/Telegram/SourceFiles/profile/profile_block_invite_link.cpp +++ b/Telegram/SourceFiles/profile/profile_block_invite_link.cpp @@ -28,6 +28,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "lang/lang_keys.h" +#include +#include + namespace Profile { using UpdateFlag = Notify::PeerUpdate::Flag; diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp b/Telegram/SourceFiles/profile/profile_block_peer_list.cpp index 19b808b48..ec5fc65e0 100644 --- a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp +++ b/Telegram/SourceFiles/profile/profile_block_peer_list.cpp @@ -25,6 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_profile.h" #include "styles/style_widgets.h" #include "auth_session.h" +#include "app.h" namespace Profile { diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.h b/Telegram/SourceFiles/profile/profile_block_peer_list.h index 879c76be8..1d4e77766 100644 --- a/Telegram/SourceFiles/profile/profile_block_peer_list.h +++ b/Telegram/SourceFiles/profile/profile_block_peer_list.h @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "profile/profile_block_widget.h" #include "styles/style_profile.h" +#include "ui/text/text.h" namespace Ui { class RippleAnimation; diff --git a/Telegram/SourceFiles/profile/profile_block_shared_media.cpp b/Telegram/SourceFiles/profile/profile_block_shared_media.cpp index 2aa7a718c..15881971c 100644 --- a/Telegram/SourceFiles/profile/profile_block_shared_media.cpp +++ b/Telegram/SourceFiles/profile/profile_block_shared_media.cpp @@ -27,6 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "mainwidget.h" #include "lang/lang_keys.h" +#include "history/history.h" namespace Profile { namespace { diff --git a/Telegram/SourceFiles/profile/profile_block_shared_media.h b/Telegram/SourceFiles/profile/profile_block_shared_media.h index f9a28c8fe..d6fc48e69 100644 --- a/Telegram/SourceFiles/profile/profile_block_shared_media.h +++ b/Telegram/SourceFiles/profile/profile_block_shared_media.h @@ -21,6 +21,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "profile/profile_block_widget.h" +#include "history/history.h" + +class History; namespace Ui { class LeftOutlineButton; diff --git a/Telegram/SourceFiles/profile/profile_block_widget.h b/Telegram/SourceFiles/profile/profile_block_widget.h index 2ed5a7408..22795613a 100644 --- a/Telegram/SourceFiles/profile/profile_block_widget.h +++ b/Telegram/SourceFiles/profile/profile_block_widget.h @@ -20,8 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include + +#include "ui/twidget.h" + #include "base/observer.h" +class PeerData; + namespace Profile { class SectionMemento; @@ -35,9 +42,9 @@ public: virtual void showFinished() { } - virtual void saveState(not_null memento) { + virtual void saveState(gsl::not_null memento) { } - virtual void restoreState(not_null memento) { + virtual void restoreState(gsl::not_null memento) { } protected: diff --git a/Telegram/SourceFiles/profile/profile_common_groups_section.h b/Telegram/SourceFiles/profile/profile_common_groups_section.h index a3c06bede..09ed58f66 100644 --- a/Telegram/SourceFiles/profile/profile_common_groups_section.h +++ b/Telegram/SourceFiles/profile/profile_common_groups_section.h @@ -22,6 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/section_widget.h" #include "window/section_memento.h" +#include "ui/effects/ripple_animation.h" +#include "ui/text/text.h" +#include "structs.h" namespace Notify { struct PeerUpdate; diff --git a/Telegram/SourceFiles/profile/profile_cover.cpp b/Telegram/SourceFiles/profile/profile_cover.cpp index 204975fd0..c03295583 100644 --- a/Telegram/SourceFiles/profile/profile_cover.cpp +++ b/Telegram/SourceFiles/profile/profile_cover.cpp @@ -38,6 +38,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwindow.h" #include "messenger.h" #include "platform/platform_file_utilities.h" +#include "styles/style_widgets.h" + +#include namespace Profile { namespace { diff --git a/Telegram/SourceFiles/profile/profile_cover.h b/Telegram/SourceFiles/profile/profile_cover.h index 8f1c3b6b2..a8d2da40e 100644 --- a/Telegram/SourceFiles/profile/profile_cover.h +++ b/Telegram/SourceFiles/profile/profile_cover.h @@ -21,6 +21,25 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "base/observer.h" +#include "base/object_ptr.h" +#include "ui/twidget.h" +#include "structs.h" + +class PhotoData; +class PeerData; +class UserData; +class ChatData; +class ChannelData; + +class Painter; + +class QMimeData; +class QWidget; +class QPaintEvent; +class QDragEvent; +class QDragEnterEvent; +class QDragLeaveEvent; +class QDropEvent; namespace style { struct RoundButton; diff --git a/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp b/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp index 0ea06e63b..a61ef024a 100644 --- a/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp +++ b/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp @@ -21,6 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "profile/profile_cover_drop_area.h" #include "styles/style_profile.h" +#include +#include namespace Profile { diff --git a/Telegram/SourceFiles/profile/profile_cover_drop_area.h b/Telegram/SourceFiles/profile/profile_cover_drop_area.h index 10677609e..d9c1133c9 100644 --- a/Telegram/SourceFiles/profile/profile_cover_drop_area.h +++ b/Telegram/SourceFiles/profile/profile_cover_drop_area.h @@ -20,6 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "ui/animation.h" +#include "ui/twidget.h" + +class QPaintEvent; + namespace Profile { class CoverDropArea : public TWidget { diff --git a/Telegram/SourceFiles/profile/profile_fixed_bar.cpp b/Telegram/SourceFiles/profile/profile_fixed_bar.cpp index f2a6b5be1..59d2efe2c 100644 --- a/Telegram/SourceFiles/profile/profile_fixed_bar.cpp +++ b/Telegram/SourceFiles/profile/profile_fixed_bar.cpp @@ -31,6 +31,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_boxes.h" #include "profile/profile_back_button.h" +#include + namespace Profile { namespace { diff --git a/Telegram/SourceFiles/profile/profile_fixed_bar.h b/Telegram/SourceFiles/profile/profile_fixed_bar.h index 6d6dfd5ef..a2c2872f2 100644 --- a/Telegram/SourceFiles/profile/profile_fixed_bar.h +++ b/Telegram/SourceFiles/profile/profile_fixed_bar.h @@ -21,6 +21,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "base/observer.h" +#include "base/object_ptr.h" +#include "ui/twidget.h" + +class PeerData; +class UserData; +class ChatData; +class ChannelData; + +class QMouseEvent; namespace Notify { struct PeerUpdate; diff --git a/Telegram/SourceFiles/profile/profile_inner_widget.h b/Telegram/SourceFiles/profile/profile_inner_widget.h index b230b4e1e..66b0bfbc1 100644 --- a/Telegram/SourceFiles/profile/profile_inner_widget.h +++ b/Telegram/SourceFiles/profile/profile_inner_widget.h @@ -20,6 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "ui/twidget.h" + +class PeerData; + +class QWidget; +class QPaintEvent; +class QKeyEvent; + namespace Profile { class CoverWidget; @@ -49,8 +58,8 @@ public: // It should show it only if it is hidden in the cover. bool shareContactButtonShown() const; - void saveState(not_null memento); - void restoreState(not_null memento); + void saveState(gsl::not_null memento); + void restoreState(gsl::not_null memento); void showFinished(); diff --git a/Telegram/SourceFiles/profile/profile_section_memento.h b/Telegram/SourceFiles/profile/profile_section_memento.h index ca6f44785..4fda46cf0 100644 --- a/Telegram/SourceFiles/profile/profile_section_memento.h +++ b/Telegram/SourceFiles/profile/profile_section_memento.h @@ -22,6 +22,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/section_memento.h" +class PeerData; + namespace Profile { class Widget; @@ -31,7 +33,7 @@ public: SectionMemento(PeerData *peer) : _peer(peer) { } - object_ptr createWidget(QWidget *parent, not_null controller, const QRect &geometry) override; + object_ptr createWidget(QWidget *parent, gsl::not_null controller, const QRect &geometry) override; PeerData *getPeer() const { return _peer; diff --git a/Telegram/SourceFiles/profile/profile_userpic_button.cpp b/Telegram/SourceFiles/profile/profile_userpic_button.cpp index 005ec009a..3820e17c6 100644 --- a/Telegram/SourceFiles/profile/profile_userpic_button.cpp +++ b/Telegram/SourceFiles/profile/profile_userpic_button.cpp @@ -23,6 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_profile.h" #include "observer_peer.h" #include "auth_session.h" +#include "app.h" namespace Profile { diff --git a/Telegram/SourceFiles/profile/profile_userpic_button.h b/Telegram/SourceFiles/profile/profile_userpic_button.h index 6e710785e..de9791afb 100644 --- a/Telegram/SourceFiles/profile/profile_userpic_button.h +++ b/Telegram/SourceFiles/profile/profile_userpic_button.h @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/abstract_button.h" #include "base/observer.h" +#include "ui/animation.h" namespace Notify { struct PeerUpdate; diff --git a/Telegram/SourceFiles/profile/profile_widget.cpp b/Telegram/SourceFiles/profile/profile_widget.cpp index f9dc74c9d..23c574b02 100644 --- a/Telegram/SourceFiles/profile/profile_widget.cpp +++ b/Telegram/SourceFiles/profile/profile_widget.cpp @@ -29,6 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/widget_fade_wrap.h" #include "ui/widgets/scroll_area.h" #include "ui/widgets/shadow.h" +#include "facades.h" namespace Profile { diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp index 1515f128e..84b6b57eb 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -19,8 +19,10 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "settings.h" +#include "structs.h" #include "platform/platform_specific.h" +#include "app.h" bool gRtl = false; Qt::LayoutDirection gLangDir = gRtl ? Qt::RightToLeft : Qt::LeftToRight; diff --git a/Telegram/SourceFiles/settings.h b/Telegram/SourceFiles/settings.h index 056ec1d70..2258d17e5 100644 --- a/Telegram/SourceFiles/settings.h +++ b/Telegram/SourceFiles/settings.h @@ -23,6 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include +#include +#include "core/utils.h" void InitFromCommandLine(int argc, char *argv[]); extern bool gDebug; diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp index 4cbe7ca08..e8a8a8074 100644 --- a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp @@ -31,6 +31,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/widget_slide_wrap.h" #include "storage/localstorage.h" #include "window/themes/window_theme.h" +#include "scheme.h" +#include "facades.h" +#include "app.h" + +#include namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.h b/Telegram/SourceFiles/settings/settings_advanced_widget.h index 5c4a9a486..38f32b48c 100644 --- a/Telegram/SourceFiles/settings/settings_advanced_widget.h +++ b/Telegram/SourceFiles/settings/settings_advanced_widget.h @@ -22,6 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "settings/settings_block_widget.h" #include "settings/settings_chat_settings_widget.h" +#include "mtproto/rpc_sender.h" +#include "mtproto/core_types.h" +#include "scheme.h" namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_block_widget.h b/Telegram/SourceFiles/settings/settings_block_widget.h index 77cdfe689..bc487e8c8 100644 --- a/Telegram/SourceFiles/settings/settings_block_widget.h +++ b/Telegram/SourceFiles/settings/settings_block_widget.h @@ -20,8 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/object_ptr.h" #include "base/observer.h" #include "styles/style_boxes.h" +#include "ui/twidget.h" + +class QPaintEvent; namespace Ui { class Checkbox; diff --git a/Telegram/SourceFiles/settings/settings_chat_settings_widget.h b/Telegram/SourceFiles/settings/settings_chat_settings_widget.h index 2e812cbcb..432c7b91a 100644 --- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.h +++ b/Telegram/SourceFiles/settings/settings_chat_settings_widget.h @@ -21,6 +21,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "settings/settings_block_widget.h" +#include "ui/twidget.h" +#include "base/observer.h" + +class QPaintEvent; namespace Ui { class FlatLabel; diff --git a/Telegram/SourceFiles/settings/settings_cover.cpp b/Telegram/SourceFiles/settings/settings_cover.cpp index c843b25dc..37e5881b6 100644 --- a/Telegram/SourceFiles/settings/settings_cover.cpp +++ b/Telegram/SourceFiles/settings/settings_cover.cpp @@ -36,6 +36,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_settings.h" #include "styles/style_profile.h" // for divider #include "platform/platform_file_utilities.h" +#include "app.h" + +#include +#include namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_cover.h b/Telegram/SourceFiles/settings/settings_cover.h index cd4ff3d34..0e3893487 100644 --- a/Telegram/SourceFiles/settings/settings_cover.h +++ b/Telegram/SourceFiles/settings/settings_cover.h @@ -22,6 +22,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "base/observer.h" #include "settings/settings_block_widget.h" +#include "structs.h" + +class PhotoData; + +class QMimeData; namespace Ui { class FlatLabel; diff --git a/Telegram/SourceFiles/settings/settings_fixed_bar.h b/Telegram/SourceFiles/settings/settings_fixed_bar.h index 89dabeb03..5a92154ee 100644 --- a/Telegram/SourceFiles/settings/settings_fixed_bar.h +++ b/Telegram/SourceFiles/settings/settings_fixed_bar.h @@ -20,6 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "ui/twidget.h" + +class QWidget; +class QPaintEvent; + namespace Ui { class IconButton; } // namespace Ui diff --git a/Telegram/SourceFiles/settings/settings_general_widget.cpp b/Telegram/SourceFiles/settings/settings_general_widget.cpp index 7410ed04c..b0fe2ec5d 100644 --- a/Telegram/SourceFiles/settings/settings_general_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_general_widget.cpp @@ -36,6 +36,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_file_parser.h" #include "lang/lang_cloud_manager.h" #include "messenger.h" +#include "app.h" namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_info_widget.cpp b/Telegram/SourceFiles/settings/settings_info_widget.cpp index e22400e61..09b1a8cc9 100644 --- a/Telegram/SourceFiles/settings/settings_info_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_info_widget.cpp @@ -29,6 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/change_phone_box.h" #include "observer_peer.h" #include "messenger.h" +#include "app.h" namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_info_widget.h b/Telegram/SourceFiles/settings/settings_info_widget.h index 2c33898e9..d244c1cc6 100644 --- a/Telegram/SourceFiles/settings/settings_info_widget.h +++ b/Telegram/SourceFiles/settings/settings_info_widget.h @@ -21,6 +21,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "settings/settings_block_widget.h" +#include "base/object_ptr.h" +#include "ui/twidget.h" + +struct TextWithEntities; namespace Ui { class FlatLabel; diff --git a/Telegram/SourceFiles/settings/settings_inner_widget.cpp b/Telegram/SourceFiles/settings/settings_inner_widget.cpp index 7a3d7f3f2..e37b1fab2 100644 --- a/Telegram/SourceFiles/settings/settings_inner_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_inner_widget.cpp @@ -32,6 +32,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "settings/settings_background_widget.h" #include "settings/settings_privacy_widget.h" #include "settings/settings_advanced_widget.h" +#include "app.h" +#include "facades.h" namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp index 3e6b8b334..a622dd72a 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp @@ -33,6 +33,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/edit_privacy_box.h" #include "boxes/self_destruction_box.h" #include "settings/settings_privacy_controllers.h" +#include "scheme.h" namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_privacy_widget.h b/Telegram/SourceFiles/settings/settings_privacy_widget.h index 89a1c7941..e0b2d5871 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_widget.h +++ b/Telegram/SourceFiles/settings/settings_privacy_widget.h @@ -22,6 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "settings/settings_block_widget.h" #include "settings/settings_chat_settings_widget.h" +#include "mtproto/rpc_sender.h" +#include "base/object_ptr.h" +#include "scheme.h" namespace Settings { diff --git a/Telegram/SourceFiles/settings/settings_scale_widget.cpp b/Telegram/SourceFiles/settings/settings_scale_widget.cpp index 8cac93601..43ec486d0 100644 --- a/Telegram/SourceFiles/settings/settings_scale_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_scale_widget.cpp @@ -29,6 +29,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/confirm_box.h" #include "application.h" #include "ui/widgets/discrete_sliders.h" +#include "facades.h" +#include "app.h" namespace Settings { namespace { diff --git a/Telegram/SourceFiles/shortcuts.cpp b/Telegram/SourceFiles/shortcuts.cpp index 317bd1ca2..0fed86f8d 100644 --- a/Telegram/SourceFiles/shortcuts.cpp +++ b/Telegram/SourceFiles/shortcuts.cpp @@ -28,6 +28,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/platform_specific.h" #include "base/parse_helper.h" +#include +#include +#include +#include +#include + namespace ShortcutCommands { using Handler = bool(*)(); diff --git a/Telegram/SourceFiles/shortcuts.h b/Telegram/SourceFiles/shortcuts.h index 3cd371e14..8623b5221 100644 --- a/Telegram/SourceFiles/shortcuts.h +++ b/Telegram/SourceFiles/shortcuts.h @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +class QStringList; +class QString; + namespace Shortcuts { void start(); diff --git a/Telegram/SourceFiles/stdafx.cpp b/Telegram/SourceFiles/stdafx.cpp deleted file mode 100644 index e7f5b5452..000000000 --- a/Telegram/SourceFiles/stdafx.cpp +++ /dev/null @@ -1,23 +0,0 @@ -/* -This file is part of Telegram Desktop, -the official desktop version of Telegram messaging app, see https://telegram.org - -Telegram Desktop is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -It is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -In addition, as a special exception, the copyright holders give permission -to link the code of portions of this program with the OpenSSL library. - -Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE -Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org -*/ -#include "stdafx.h" - -// Precompiled header helper. diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h deleted file mode 100644 index f39f36f65..000000000 --- a/Telegram/SourceFiles/stdafx.h +++ /dev/null @@ -1,129 +0,0 @@ -/* -This file is part of Telegram Desktop, -the official desktop version of Telegram messaging app, see https://telegram.org - -Telegram Desktop is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -It is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -In addition, as a special exception, the copyright holders give permission -to link the code of portions of this program with the OpenSSL library. - -Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE -Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org -*/ - -#define NOMINMAX // no min() and max() macro declarations -#define __HUGE - -// Fix Google Breakpad build for Mac App Store version -#ifdef Q_OS_MAC -#define __STDC_FORMAT_MACROS -#endif // Q_OS_MAC - -#ifdef __cplusplus - -#include - -// False positive warning in clang for QMap member function value: -// const T QMap::value(const Key &akey, const T &adefaultValue) -// fires with "Returning address of local temporary object" which is not true. -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wreturn-stack-address" -#endif // __clang__ - -#include - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif // __clang__ - -#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) -#define OS_MAC_OLD -#endif // QT_VERSION < 5.5.0 - -#ifdef OS_MAC_STORE -#define MAC_USE_BREAKPAD -#endif // OS_MAC_STORE - -#ifdef Q_OS_WIN -#include - -// Windows Header Files: -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#endif - -#include -#include - -#include -#include -#include -#include -#include -#include - -// Ensures/Expects. -#include - -// Redefine Ensures/Expects by our own assertions. -#include "base/assertion.h" - -#include - -#include "base/variant.h" -#include "base/optional.h" -#include "base/algorithm.h" - -#include "core/basic_types.h" -#include "logs.h" -#include "core/utils.h" -#include "base/lambda.h" -#include "base/lambda_guard.h" -#include "config.h" - -#include "mtproto/facade.h" - -#include "ui/style/style_core.h" -#include "styles/palette.h" -#include "styles/style_basic.h" - -#include "ui/animation.h" -#include "ui/twidget.h" -#include "ui/images.h" -#include "ui/text/text.h" - -#include "app.h" -#include "facades.h" - -#endif // __cplusplus diff --git a/Telegram/SourceFiles/storage/file_download.h b/Telegram/SourceFiles/storage/file_download.h index 115f6bf47..e00f1da5a 100644 --- a/Telegram/SourceFiles/storage/file_download.h +++ b/Telegram/SourceFiles/storage/file_download.h @@ -20,8 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include + #include "base/observer.h" #include "storage/localimageloader.h" // for TaskId +#include "mtproto/facade.h" namespace Storage { diff --git a/Telegram/SourceFiles/storage/file_upload.cpp b/Telegram/SourceFiles/storage/file_upload.cpp index 0dbac978f..2c3234c4e 100644 --- a/Telegram/SourceFiles/storage/file_upload.cpp +++ b/Telegram/SourceFiles/storage/file_upload.cpp @@ -19,6 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "storage/file_upload.h" +#include "app.h" namespace Storage { namespace { diff --git a/Telegram/SourceFiles/storage/file_upload.h b/Telegram/SourceFiles/storage/file_upload.h index c8e50af2c..bd9909132 100644 --- a/Telegram/SourceFiles/storage/file_upload.h +++ b/Telegram/SourceFiles/storage/file_upload.h @@ -21,6 +21,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "storage/localimageloader.h" +#include "mtproto/rpc_sender.h" +#include "mtproto/facade.h" + +class RPCError; namespace Storage { diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp index 22f7303c3..486180667 100644 --- a/Telegram/SourceFiles/storage/localimageloader.cpp +++ b/Telegram/SourceFiles/storage/localimageloader.cpp @@ -30,6 +30,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/confirm_box.h" #include "storage/file_download.h" +#include + namespace { bool ValidateThumbDimensions(int width, int height) { diff --git a/Telegram/SourceFiles/storage/localimageloader.h b/Telegram/SourceFiles/storage/localimageloader.h index 7d868a2fa..625681908 100644 --- a/Telegram/SourceFiles/storage/localimageloader.h +++ b/Telegram/SourceFiles/storage/localimageloader.h @@ -20,7 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include +#include +#include #include "base/variant.h" +#include "structs.h" enum class CompressConfirm { Auto, diff --git a/Telegram/SourceFiles/storage/localstorage.cpp b/Telegram/SourceFiles/storage/localstorage.cpp index c605122ba..5cd664331 100644 --- a/Telegram/SourceFiles/storage/localstorage.cpp +++ b/Telegram/SourceFiles/storage/localstorage.cpp @@ -40,6 +40,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include +#include +#include +#include +#include + namespace Local { namespace { diff --git a/Telegram/SourceFiles/storage/localstorage.h b/Telegram/SourceFiles/storage/localstorage.h index 225a940d3..16df21893 100644 --- a/Telegram/SourceFiles/storage/localstorage.h +++ b/Telegram/SourceFiles/storage/localstorage.h @@ -23,6 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "core/basic_types.h" #include "storage/file_download.h" #include "auth_session.h" +#include "history/history.h" namespace Window { namespace Theme { diff --git a/Telegram/SourceFiles/storage/serialize_document.cpp b/Telegram/SourceFiles/storage/serialize_document.cpp index 9e7cca44c..f8bf17315 100644 --- a/Telegram/SourceFiles/storage/serialize_document.cpp +++ b/Telegram/SourceFiles/storage/serialize_document.cpp @@ -21,6 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/serialize_document.h" #include "storage/serialize_common.h" +#include "facades.h" +#include "app.h" namespace { diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp index 04078c089..c6ad1d3ef 100644 --- a/Telegram/SourceFiles/structs.cpp +++ b/Telegram/SourceFiles/structs.cpp @@ -38,6 +38,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "auth_session.h" #include "messenger.h" #include "storage/file_download.h" +#include namespace { diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h index 9d2386f7b..e54e0d3e9 100644 --- a/Telegram/SourceFiles/structs.h +++ b/Telegram/SourceFiles/structs.h @@ -20,6 +20,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include + +#include "scheme.h" +#include "ui/images.h" +#include "ui/twidget.h" +#include "ui/text/text.h" + using MediaKey = QPair; inline quint64 mediaMix32To64(qint32 a, qint32 b) { diff --git a/Telegram/SourceFiles/ui/abstract_button.cpp b/Telegram/SourceFiles/ui/abstract_button.cpp index 11be386b1..f8becf8ab 100644 --- a/Telegram/SourceFiles/ui/abstract_button.cpp +++ b/Telegram/SourceFiles/ui/abstract_button.cpp @@ -19,6 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/abstract_button.h" +#include + namespace Ui { diff --git a/Telegram/SourceFiles/ui/animation.cpp b/Telegram/SourceFiles/ui/animation.cpp index 71b4821ec..6387d7925 100644 --- a/Telegram/SourceFiles/ui/animation.cpp +++ b/Telegram/SourceFiles/ui/animation.cpp @@ -18,10 +18,12 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ + #include "animation.h" #include "media/media_clip_reader.h" + namespace Media { namespace Clip { diff --git a/Telegram/SourceFiles/ui/animation.h b/Telegram/SourceFiles/ui/animation.h index b0beec638..2559db78f 100644 --- a/Telegram/SourceFiles/ui/animation.h +++ b/Telegram/SourceFiles/ui/animation.h @@ -20,10 +20,22 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "core/basic_types.h" -#include -#include +#define _USE_MATH_DEFINES // for M_PI in MSVC (GCC and Clang has it as extension) + +#include +#include +#include +#include +#include +#include #include +#include + +#include "core/basic_types.h" +#include "core/utils.h" +#include "base/lambda.h" +#include "style/style_core_types.h" +#include "mtproto/facade.h" namespace Media { namespace Clip { @@ -421,7 +433,7 @@ QPainterPath path(QPointF (&from)[N]) { bool Disabled(); void SetDisabled(bool disabled); -}; +} // anim namespace class BasicAnimation; diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp index 81ff94358..a63e55302 100644 --- a/Telegram/SourceFiles/ui/countryinput.cpp +++ b/Telegram/SourceFiles/ui/countryinput.cpp @@ -28,6 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "countries.h" #include "styles/style_boxes.h" #include "styles/style_intro.h" +#include "facades.h" namespace { diff --git a/Telegram/SourceFiles/ui/countryinput.h b/Telegram/SourceFiles/ui/countryinput.h index bef805bd7..87e2097ba 100644 --- a/Telegram/SourceFiles/ui/countryinput.h +++ b/Telegram/SourceFiles/ui/countryinput.h @@ -22,6 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/abstract_box.h" #include "styles/style_widgets.h" +#include "ui/effects/ripple_animation.h" QString findValidCode(QString fullCode); diff --git a/Telegram/SourceFiles/ui/effects/cross_animation.cpp b/Telegram/SourceFiles/ui/effects/cross_animation.cpp index 039aeda4f..2949cc357 100644 --- a/Telegram/SourceFiles/ui/effects/cross_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/cross_animation.cpp @@ -19,6 +19,9 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/effects/cross_animation.h" +#include "ui/twidget.h" + +#include namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/effects/cross_animation.h b/Telegram/SourceFiles/ui/effects/cross_animation.h index ca4a834fc..4e72f5b70 100644 --- a/Telegram/SourceFiles/ui/effects/cross_animation.h +++ b/Telegram/SourceFiles/ui/effects/cross_animation.h @@ -21,6 +21,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "styles/style_widgets.h" +#include "ui/style/style_core_types.h" + +class Painter; namespace Ui { diff --git a/Telegram/SourceFiles/ui/effects/panel_animation.cpp b/Telegram/SourceFiles/ui/effects/panel_animation.cpp index 902e804ec..d278e8dfb 100644 --- a/Telegram/SourceFiles/ui/effects/panel_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/panel_animation.cpp @@ -19,6 +19,9 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/effects/panel_animation.h" +#include "ui/twidget.h" +#include "ui/animation.h" +#include "app.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/effects/radial_animation.cpp b/Telegram/SourceFiles/ui/effects/radial_animation.cpp index 904d49006..596f6d9e0 100644 --- a/Telegram/SourceFiles/ui/effects/radial_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/radial_animation.cpp @@ -19,6 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/effects/radial_animation.h" +#include "styles/style_media_player.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/effects/radial_animation.h b/Telegram/SourceFiles/ui/effects/radial_animation.h index eedf2323d..0aeba0c16 100644 --- a/Telegram/SourceFiles/ui/effects/radial_animation.h +++ b/Telegram/SourceFiles/ui/effects/radial_animation.h @@ -19,6 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "ui/animation.h" +#include "ui/twidget.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/effects/ripple_animation.cpp b/Telegram/SourceFiles/ui/effects/ripple_animation.cpp index 82fba1a00..86125a794 100644 --- a/Telegram/SourceFiles/ui/effects/ripple_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/ripple_animation.cpp @@ -19,6 +19,11 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/effects/ripple_animation.h" +#include "ui/twidget.h" +#include "ui/animation.h" +#include "app.h" + +#include namespace Ui { diff --git a/Telegram/SourceFiles/ui/effects/ripple_animation.h b/Telegram/SourceFiles/ui/effects/ripple_animation.h index 44137a171..1b1227950 100644 --- a/Telegram/SourceFiles/ui/effects/ripple_animation.h +++ b/Telegram/SourceFiles/ui/effects/ripple_animation.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "styles/style_widgets.h" +#include "base/lambda.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp index b40b669b2..fb00eed43 100644 --- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp +++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp @@ -19,6 +19,11 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/effects/round_checkbox.h" +#include "ui/twidget.h" +#include "ui/animation.h" + +#include +#include "app.h" namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.h b/Telegram/SourceFiles/ui/effects/round_checkbox.h index 3523e33b9..ba1e39742 100644 --- a/Telegram/SourceFiles/ui/effects/round_checkbox.h +++ b/Telegram/SourceFiles/ui/effects/round_checkbox.h @@ -21,6 +21,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "styles/style_widgets.h" +#include "base/lambda.h" +#include "ui/animation.h" + +#include + +class Painter; namespace Ui { diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp index 291730f2c..31020fddc 100644 --- a/Telegram/SourceFiles/ui/effects/send_action_animations.cpp +++ b/Telegram/SourceFiles/ui/effects/send_action_animations.cpp @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/send_action_animations.h" #include "styles/style_widgets.h" +#include "ui/animation.h" namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/effects/send_action_animations.h b/Telegram/SourceFiles/ui/effects/send_action_animations.h index 1cc187033..0a216677a 100644 --- a/Telegram/SourceFiles/ui/effects/send_action_animations.h +++ b/Telegram/SourceFiles/ui/effects/send_action_animations.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "structs.h" + namespace Ui { class SendActionAnimation { diff --git a/Telegram/SourceFiles/ui/effects/slide_animation.cpp b/Telegram/SourceFiles/ui/effects/slide_animation.cpp index 8d8f64922..129838712 100644 --- a/Telegram/SourceFiles/ui/effects/slide_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/slide_animation.cpp @@ -19,6 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/effects/slide_animation.h" +#include "ui/twidget.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/effects/slide_animation.h b/Telegram/SourceFiles/ui/effects/slide_animation.h index 5efafec9c..33dfaa5c2 100644 --- a/Telegram/SourceFiles/ui/effects/slide_animation.h +++ b/Telegram/SourceFiles/ui/effects/slide_animation.h @@ -20,6 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "ui/animation.h" +#include + +class Painter; + namespace Ui { class SlideAnimation { diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp index 0978014ae..175ba9b9a 100644 --- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp +++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp @@ -19,6 +19,11 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/effects/widget_fade_wrap.h" +#include "ui/twidget.h" +#include "app.h" + +#include +#include namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h index e4cdfd038..8387c2941 100644 --- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h +++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.h @@ -20,9 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -class TWidget; +#include "ui/twidget.h" +#include "base/lambda.h" +#include "base/object_ptr.h" #include "styles/style_widgets.h" +#include "ui/animation.h" + +#include +#include + +class QWidget; +class QPaintEvent; namespace Ui { diff --git a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h index a22f57abf..1535e9720 100644 --- a/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h +++ b/Telegram/SourceFiles/ui/effects/widget_slide_wrap.h @@ -21,6 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "styles/style_widgets.h" +#include "ui/twidget.h" +#include "ui/animation.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/emoji_config.h b/Telegram/SourceFiles/ui/emoji_config.h index 8bfca91ac..609c5d87f 100644 --- a/Telegram/SourceFiles/ui/emoji_config.h +++ b/Telegram/SourceFiles/ui/emoji_config.h @@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "settings.h" #include "ui/text/text.h" #include "emoji.h" diff --git a/Telegram/SourceFiles/ui/images.cpp b/Telegram/SourceFiles/ui/images.cpp index 7d9eddcd3..5171aa29b 100644 --- a/Telegram/SourceFiles/ui/images.cpp +++ b/Telegram/SourceFiles/ui/images.cpp @@ -25,6 +25,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "platform/platform_specific.h" #include "auth_session.h" +#include +#include + namespace Images { namespace { diff --git a/Telegram/SourceFiles/ui/images.h b/Telegram/SourceFiles/ui/images.h index 969267981..e24be91cb 100644 --- a/Telegram/SourceFiles/ui/images.h +++ b/Telegram/SourceFiles/ui/images.h @@ -20,7 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include #include "base/flags.h" +#include "style/style_core_types.h" +#include "scheme.h" class FileLoader; class mtpFileLoader; diff --git a/Telegram/SourceFiles/ui/special_buttons.cpp b/Telegram/SourceFiles/ui/special_buttons.cpp index d714aa43c..a487979e9 100644 --- a/Telegram/SourceFiles/ui/special_buttons.cpp +++ b/Telegram/SourceFiles/ui/special_buttons.cpp @@ -24,6 +24,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_history.h" #include "dialogs/dialogs_layout.h" #include "ui/effects/ripple_animation.h" +#include "twidget.h" +#include "structs.h" +#include "app.h" + +#include namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/style/style_core.cpp b/Telegram/SourceFiles/ui/style/style_core.cpp index 291dbe357..46956f206 100644 --- a/Telegram/SourceFiles/ui/style/style_core.cpp +++ b/Telegram/SourceFiles/ui/style/style_core.cpp @@ -19,6 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/style/style_core.h" +#include "ui/animation.h" +#include "ui/twidget.h" namespace style { namespace internal { diff --git a/Telegram/SourceFiles/ui/style/style_core.h b/Telegram/SourceFiles/ui/style/style_core.h index f2520347e..b690d8540 100644 --- a/Telegram/SourceFiles/ui/style/style_core.h +++ b/Telegram/SourceFiles/ui/style/style_core.h @@ -20,7 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include +#include + #include "ui/style/style_core_types.h" +#include "settings.h" inline QPoint rtlpoint(int x, int y, int outerw) { return QPoint(rtl() ? (outerw - x) : x, y); diff --git a/Telegram/SourceFiles/ui/style/style_core_color.cpp b/Telegram/SourceFiles/ui/style/style_core_color.cpp index fe21a4e7a..a5a811509 100644 --- a/Telegram/SourceFiles/ui/style/style_core_color.cpp +++ b/Telegram/SourceFiles/ui/style/style_core_color.cpp @@ -19,6 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/style/style_core_color.h" +#include "styles/palette.h" namespace style { namespace internal { diff --git a/Telegram/SourceFiles/ui/style/style_core_color.h b/Telegram/SourceFiles/ui/style/style_core_color.h index 7ddbd4e67..24a302233 100644 --- a/Telegram/SourceFiles/ui/style/style_core_color.h +++ b/Telegram/SourceFiles/ui/style/style_core_color.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include + namespace style { class palette; diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp index 4e71d17cd..3f19559e7 100644 --- a/Telegram/SourceFiles/ui/style/style_core_font.cpp +++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp @@ -20,6 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/style/style_core_font.h" +#include +#include +#include +#include "ui/twidget.h" +#include "core/basic_types.h" + namespace style { namespace internal { namespace { diff --git a/Telegram/SourceFiles/ui/style/style_core_font.h b/Telegram/SourceFiles/ui/style/style_core_font.h index d28841b12..179a250a6 100644 --- a/Telegram/SourceFiles/ui/style/style_core_font.h +++ b/Telegram/SourceFiles/ui/style/style_core_font.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include + namespace style { namespace internal { diff --git a/Telegram/SourceFiles/ui/style/style_core_icon.cpp b/Telegram/SourceFiles/ui/style/style_core_icon.cpp index 625e2c496..0fd944493 100644 --- a/Telegram/SourceFiles/ui/style/style_core_icon.cpp +++ b/Telegram/SourceFiles/ui/style/style_core_icon.cpp @@ -19,6 +19,11 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/style/style_core_icon.h" +#include "settings.h" +#include "style_core.h" +#include "app.h" + +#include namespace style { namespace internal { diff --git a/Telegram/SourceFiles/ui/style/style_core_icon.h b/Telegram/SourceFiles/ui/style/style_core_icon.h index edfe52c11..2e1c3d1fe 100644 --- a/Telegram/SourceFiles/ui/style/style_core_icon.h +++ b/Telegram/SourceFiles/ui/style/style_core_icon.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/assertion.h" +#include "core/utils.h" #include "ui/style/style_core_color.h" #include diff --git a/Telegram/SourceFiles/ui/style/style_core_types.h b/Telegram/SourceFiles/ui/style/style_core_types.h index 65843faf3..8e1b91896 100644 --- a/Telegram/SourceFiles/ui/style/style_core_types.h +++ b/Telegram/SourceFiles/ui/style/style_core_types.h @@ -20,12 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "ui/style/style_core_font.h" #include "ui/style/style_core_color.h" diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp index 59cb93b34..1b899d708 100644 --- a/Telegram/SourceFiles/ui/text/text.cpp +++ b/Telegram/SourceFiles/ui/text/text.cpp @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include +#include "app.h" #include "ui/text/text.h" #include "core/utils.h" // makeShared diff --git a/Telegram/SourceFiles/ui/text/text.h b/Telegram/SourceFiles/ui/text/text.h index e82bda720..53d963799 100644 --- a/Telegram/SourceFiles/ui/text/text.h +++ b/Telegram/SourceFiles/ui/text/text.h @@ -20,8 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "private/qfixed_p.h" +#include +#include +#include +#include "private/qfixed_p.h" +#include "styles/style_basic.h" +#include "ui/twidget.h" #include "core/click_handler.h" #include "ui/text/text_entity.h" #include "ui/emoji_config.h" diff --git a/Telegram/SourceFiles/ui/text/text_block.cpp b/Telegram/SourceFiles/ui/text/text_block.cpp index df0a62a87..5dee424ff 100644 --- a/Telegram/SourceFiles/ui/text/text_block.cpp +++ b/Telegram/SourceFiles/ui/text/text_block.cpp @@ -19,6 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/text/text_block.h" +#include "ui/style/style_core_types.h" +#include "app.h" // COPIED FROM qtextlayout.cpp AND MODIFIED namespace { diff --git a/Telegram/SourceFiles/ui/text/text_block.h b/Telegram/SourceFiles/ui/text/text_block.h index bb9976fd6..15e90edc5 100644 --- a/Telegram/SourceFiles/ui/text/text_block.h +++ b/Telegram/SourceFiles/ui/text/text_block.h @@ -21,6 +21,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "private/qfontengine_p.h" +#include "ui/style/style_core_types.h" +#include "settings.h" + +class QString; enum TextBlockType { TextBlockTNewline = 0x01, diff --git a/Telegram/SourceFiles/ui/text/text_entity.cpp b/Telegram/SourceFiles/ui/text/text_entity.cpp index 98fc1b516..37c2aebb9 100644 --- a/Telegram/SourceFiles/ui/text/text_entity.cpp +++ b/Telegram/SourceFiles/ui/text/text_entity.cpp @@ -22,6 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "auth_session.h" #include "lang/lang_tag.h" +#include "app.h" + +#include namespace TextUtilities { diff --git a/Telegram/SourceFiles/ui/text/text_entity.h b/Telegram/SourceFiles/ui/text/text_entity.h index 02cd92006..dad20d6a4 100644 --- a/Telegram/SourceFiles/ui/text/text_entity.h +++ b/Telegram/SourceFiles/ui/text/text_entity.h @@ -20,6 +20,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include + +#include "scheme.h" + enum EntityInTextType { EntityInTextInvalid = 0, diff --git a/Telegram/SourceFiles/ui/toast/toast.cpp b/Telegram/SourceFiles/ui/toast/toast.cpp index 5e6dd0955..cbd7c824f 100644 --- a/Telegram/SourceFiles/ui/toast/toast.cpp +++ b/Telegram/SourceFiles/ui/toast/toast.cpp @@ -24,6 +24,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/toast/toast_widget.h" #include "mainwindow.h" +#include +#include "app.h" + namespace Ui { namespace Toast { diff --git a/Telegram/SourceFiles/ui/toast/toast.h b/Telegram/SourceFiles/ui/toast/toast.h index 08bd4eaf7..feb4056de 100644 --- a/Telegram/SourceFiles/ui/toast/toast.h +++ b/Telegram/SourceFiles/ui/toast/toast.h @@ -19,6 +19,14 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include "core/utils.h" +#include "ui/animation.h" + +class QWidget; + +class Config; namespace Ui { namespace Toast { diff --git a/Telegram/SourceFiles/ui/toast/toast_widget.cpp b/Telegram/SourceFiles/ui/toast/toast_widget.cpp index 782e82de2..bc762cfb7 100644 --- a/Telegram/SourceFiles/ui/toast/toast_widget.cpp +++ b/Telegram/SourceFiles/ui/toast/toast_widget.cpp @@ -19,6 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/toast/toast_widget.h" +#include "app.h" namespace Ui { namespace Toast { diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp index dcee47ee8..2b4c1e270 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp @@ -18,10 +18,15 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ -#include "twidget.h" - #include "application.h" +#include "twidget.h" #include "mainwindow.h" +#include "window/main_window.h" +#include "messenger.h" +#include "app.h" + +#include +#include namespace Fonts { namespace { diff --git a/Telegram/SourceFiles/ui/twidget.h b/Telegram/SourceFiles/ui/twidget.h index ddbed035c..d086c5f71 100644 --- a/Telegram/SourceFiles/ui/twidget.h +++ b/Telegram/SourceFiles/ui/twidget.h @@ -20,7 +20,19 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include +#include +#include +#include "base/lambda.h" #include "base/flags.h" +#include "base/object_ptr.h" +#include "ui/style/style_core.h" +#include "styles/palette.h" +#include "styles/style_basic.h" + namespace Fonts { @@ -415,108 +427,6 @@ private: }; -// Smart pointer for QObject*, has move semantics, destroys object if it doesn't have a parent. -template -class object_ptr { -public: - object_ptr(std::nullptr_t) { - } - - // No default constructor, but constructors with at least - // one argument are simply make functions. - template - explicit object_ptr(Parent &&parent, Args&&... args) : _object(new Object(std::forward(parent), std::forward(args)...)) { - } - - object_ptr(const object_ptr &other) = delete; - object_ptr &operator=(const object_ptr &other) = delete; - object_ptr(object_ptr &&other) : _object(base::take(other._object)) { - } - object_ptr &operator=(object_ptr &&other) { - auto temp = std::move(other); - destroy(); - std::swap(_object, temp._object); - return *this; - } - - template ::value>> - object_ptr(object_ptr &&other) : _object(base::take(other._object)) { - } - - template ::value>> - object_ptr &operator=(object_ptr &&other) { - _object = base::take(other._object); - return *this; - } - - object_ptr &operator=(std::nullptr_t) { - _object = nullptr; - return *this; - } - - // So we can pass this pointer to methods like connect(). - Object *data() const { - return static_cast(_object.data()); - } - operator Object*() const { - return data(); - } - - explicit operator bool() const { - return _object != nullptr; - } - - Object *operator->() const { - return data(); - } - Object &operator*() const { - return *data(); - } - - // Use that instead "= new Object(parent, ...)" - template - void create(Parent &&parent, Args&&... args) { - destroy(); - _object = new Object(std::forward(parent), std::forward(args)...); - } - void destroy() { - delete base::take(_object); - } - void destroyDelayed() { - if (_object) { - if (auto widget = base::up_cast(data())) { - widget->hide(); - } - base::take(_object)->deleteLater(); - } - } - - ~object_ptr() { - if (auto pointer = _object) { - if (!pointer->parent()) { - destroy(); - } - } - } - - template - friend object_ptr static_object_cast(object_ptr source); - -private: - template - friend class object_ptr; - - QPointer _object; - -}; - -template -inline object_ptr static_object_cast(object_ptr source) { - auto result = object_ptr(nullptr); - result._object = static_cast(base::take(source._object).data()); - return std::move(result); -} - void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton button, const QPoint &globalPoint); inline void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton button) { diff --git a/Telegram/SourceFiles/ui/widgets/buttons.cpp b/Telegram/SourceFiles/ui/widgets/buttons.cpp index 2bd627d85..bb5401c30 100644 --- a/Telegram/SourceFiles/ui/widgets/buttons.cpp +++ b/Telegram/SourceFiles/ui/widgets/buttons.cpp @@ -23,6 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/ripple_animation.h" #include "ui/effects/cross_animation.h" #include "lang/lang_instance.h" +#include "app.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/buttons.h b/Telegram/SourceFiles/ui/widgets/buttons.h index 46cf36ed8..4667105c2 100644 --- a/Telegram/SourceFiles/ui/widgets/buttons.h +++ b/Telegram/SourceFiles/ui/widgets/buttons.h @@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/abstract_button.h" #include "styles/style_widgets.h" - +#include "ui/animation.h" #include namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/checkbox.cpp b/Telegram/SourceFiles/ui/widgets/checkbox.cpp index 31d69f330..03b1cda01 100644 --- a/Telegram/SourceFiles/ui/widgets/checkbox.cpp +++ b/Telegram/SourceFiles/ui/widgets/checkbox.cpp @@ -22,6 +22,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "ui/effects/ripple_animation.h" +#include "app.h" + +#include +#include namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/widgets/checkbox.h b/Telegram/SourceFiles/ui/widgets/checkbox.h index b31bb587b..fec308994 100644 --- a/Telegram/SourceFiles/ui/widgets/checkbox.h +++ b/Telegram/SourceFiles/ui/widgets/checkbox.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "ui/widgets/buttons.h" +#include "ui/text/text.h" #include "styles/style_widgets.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp index ae0c2090e..d84f30689 100644 --- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp +++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp @@ -18,8 +18,14 @@ to link the code of portions of this program with the OpenSSL library. Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ +#include "core/single_timer.h" +#include "ui/twidget.h" +#include "app.h" +#include "facades.h" #include "ui/widgets/continuous_sliders.h" +#include + namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.h b/Telegram/SourceFiles/ui/widgets/continuous_sliders.h index 6575825f6..d9fb48794 100644 --- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.h +++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.h @@ -20,8 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/lambda.h" +#include "core/single_timer.h" #include "styles/style_widgets.h" - +#include "ui/twidget.h" +#include "ui/animation.h" namespace Ui { class ContinuousSlider : public TWidget { diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp index c223388d5..4d0ecd83b 100644 --- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp +++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.cpp @@ -23,6 +23,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/ripple_animation.h" #include "styles/style_widgets.h" +#include +#include + namespace Ui { DiscreteSlider::DiscreteSlider(QWidget *parent) : TWidget(parent) { diff --git a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h index 5a324b254..ff5caf913 100644 --- a/Telegram/SourceFiles/ui/widgets/discrete_sliders.h +++ b/Telegram/SourceFiles/ui/widgets/discrete_sliders.h @@ -20,8 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "ui/twidget.h" +#include "base/lambda.h" +#include "ui/animation.h" #include "styles/style_widgets.h" +class QMouseEvent; +class QTimerEvent; + namespace Ui { class RippleAnimation; diff --git a/Telegram/SourceFiles/ui/widgets/dropdown_menu.h b/Telegram/SourceFiles/ui/widgets/dropdown_menu.h index bf3001352..f449913fc 100644 --- a/Telegram/SourceFiles/ui/widgets/dropdown_menu.h +++ b/Telegram/SourceFiles/ui/widgets/dropdown_menu.h @@ -21,6 +21,9 @@ #include "ui/widgets/inner_dropdown.h" #include "ui/widgets/menu.h" +#include +#include + namespace Ui { class DropdownMenu : public InnerDropdown { diff --git a/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp b/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp index f2c558803..8524ba32d 100644 --- a/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp +++ b/Telegram/SourceFiles/ui/widgets/inner_dropdown.cpp @@ -24,6 +24,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/scroll_area.h" #include "ui/widgets/shadow.h" #include "ui/effects/panel_animation.h" +#include "app.h" + +#include namespace { diff --git a/Telegram/SourceFiles/ui/widgets/inner_dropdown.h b/Telegram/SourceFiles/ui/widgets/inner_dropdown.h index 17d9ae8e8..9d9727bb4 100644 --- a/Telegram/SourceFiles/ui/widgets/inner_dropdown.h +++ b/Telegram/SourceFiles/ui/widgets/inner_dropdown.h @@ -20,8 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "ui/twidget.h" #include "styles/style_widgets.h" #include "ui/effects/panel_animation.h" +#include "ui/animation.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.cpp b/Telegram/SourceFiles/ui/widgets/input_fields.cpp index edf744543..02777fa0c 100644 --- a/Telegram/SourceFiles/ui/widgets/input_fields.cpp +++ b/Telegram/SourceFiles/ui/widgets/input_fields.cpp @@ -27,6 +27,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "lang/lang_keys.h" #include "numbers.h" #include "messenger.h" +#include "app.h" + +#include +#include +#include +#include +#include +#include namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.h b/Telegram/SourceFiles/ui/widgets/input_fields.h index 17d2816a6..2e893fc09 100644 --- a/Telegram/SourceFiles/ui/widgets/input_fields.h +++ b/Telegram/SourceFiles/ui/widgets/input_fields.h @@ -20,8 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once -#include "styles/style_widgets.h" +#include +#include +#include +#include +#include "base/lambda.h" +#include "styles/style_widgets.h" +#include "history/history.h" +#include "ui/twidget.h" class UserData; namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/labels.cpp b/Telegram/SourceFiles/ui/widgets/labels.cpp index ff2553a3f..8cce3cea9 100644 --- a/Telegram/SourceFiles/ui/widgets/labels.cpp +++ b/Telegram/SourceFiles/ui/widgets/labels.cpp @@ -23,6 +23,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/popup_menu.h" #include "mainwindow.h" #include "lang/lang_keys.h" +#include "app.h" +#include "facades.h" + +#include +#include +#include namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/widgets/labels.h b/Telegram/SourceFiles/ui/widgets/labels.h index 494e32b20..2e25486cd 100644 --- a/Telegram/SourceFiles/ui/widgets/labels.h +++ b/Telegram/SourceFiles/ui/widgets/labels.h @@ -20,7 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include #include "styles/style_widgets.h" +#include "ui/twidget.h" +#include "ui/animation.h" +#include "ui/text/text.h" +#include "ui/text/text_entity.h" +#include "core/click_handler.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/menu.cpp b/Telegram/SourceFiles/ui/widgets/menu.cpp index d5761224c..f3314b3ad 100644 --- a/Telegram/SourceFiles/ui/widgets/menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/menu.cpp @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/ripple_animation.h" #include "ui/widgets/checkbox.h" +#include +#include + namespace Ui { Menu::ActionData::~ActionData() = default; diff --git a/Telegram/SourceFiles/ui/widgets/menu.h b/Telegram/SourceFiles/ui/widgets/menu.h index f0ec4c5fb..e56634a8e 100644 --- a/Telegram/SourceFiles/ui/widgets/menu.h +++ b/Telegram/SourceFiles/ui/widgets/menu.h @@ -20,8 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/lambda.h" #include "styles/style_widgets.h" +#include +#include +#include +#include "ui/twidget.h" + namespace Ui { class ToggleView; diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.cpp b/Telegram/SourceFiles/ui/widgets/multi_select.cpp index f0e5f49e0..f328f82b0 100644 --- a/Telegram/SourceFiles/ui/widgets/multi_select.cpp +++ b/Telegram/SourceFiles/ui/widgets/multi_select.cpp @@ -26,6 +26,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/scroll_area.h" #include "ui/effects/cross_animation.h" #include "lang/lang_keys.h" +#include "ui/twidget.h" +#include "layout.h" +#include "app.h" namespace Ui { namespace { diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.h b/Telegram/SourceFiles/ui/widgets/multi_select.h index b2a088ef4..85e9de970 100644 --- a/Telegram/SourceFiles/ui/widgets/multi_select.h +++ b/Telegram/SourceFiles/ui/widgets/multi_select.h @@ -21,6 +21,17 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "styles/style_widgets.h" +#include "base/lambda.h" +#include "base/object_ptr.h" +#include "ui/twidget.h" + +#include +#include "ui/animation.h" +#include "ui/text/text.h" + +class QPaintEvent; +class QMouseEvent; +class QKeyEvent; namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp index 4782ca5b5..04e7a2171 100644 --- a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp +++ b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp @@ -22,6 +22,10 @@ #include "application.h" #include "mainwindow.h" #include "lang/lang_keys.h" +#include "app.h" +#include "ui/effects/panel_animation.h" + +#include namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/popup_menu.h b/Telegram/SourceFiles/ui/widgets/popup_menu.h index aed4ac201..c426690c9 100644 --- a/Telegram/SourceFiles/ui/widgets/popup_menu.h +++ b/Telegram/SourceFiles/ui/widgets/popup_menu.h @@ -20,6 +20,9 @@ #include "styles/style_widgets.h" #include "ui/widgets/menu.h" #include "ui/effects/panel_animation.h" +#include "ui/animation.h" +#include "qevent.h" +#include "base/lambda.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/scroll_area.cpp b/Telegram/SourceFiles/ui/widgets/scroll_area.cpp index 075dd436e..28471bf80 100644 --- a/Telegram/SourceFiles/ui/widgets/scroll_area.cpp +++ b/Telegram/SourceFiles/ui/widgets/scroll_area.cpp @@ -20,6 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #include "ui/widgets/scroll_area.h" +#include +#include +#include +#include + namespace Ui { // flick scroll taken from http://qt-project.org/doc/qt-4.8/demos-embedded-anomaly-src-flickcharm-cpp.html diff --git a/Telegram/SourceFiles/ui/widgets/scroll_area.h b/Telegram/SourceFiles/ui/widgets/scroll_area.h index 401d09afd..8f0753424 100644 --- a/Telegram/SourceFiles/ui/widgets/scroll_area.h +++ b/Telegram/SourceFiles/ui/widgets/scroll_area.h @@ -20,6 +20,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include +#include + +#include "ui/animation.h" +#include "ui/twidget.h" #include "styles/style_widgets.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/shadow.h b/Telegram/SourceFiles/ui/widgets/shadow.h index fcce8cc1d..4d1499437 100644 --- a/Telegram/SourceFiles/ui/widgets/shadow.h +++ b/Telegram/SourceFiles/ui/widgets/shadow.h @@ -17,7 +17,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include #include "styles/style_widgets.h" +#include "ui/twidget.h" namespace Ui { diff --git a/Telegram/SourceFiles/ui/widgets/tooltip.cpp b/Telegram/SourceFiles/ui/widgets/tooltip.cpp index e6b211462..0415adc9b 100644 --- a/Telegram/SourceFiles/ui/widgets/tooltip.cpp +++ b/Telegram/SourceFiles/ui/widgets/tooltip.cpp @@ -21,6 +21,12 @@ #include "styles/style_widgets.h" #include "platform/platform_specific.h" +#include +#include +#include + +#include "app.h" + namespace Ui { Tooltip *TooltipInstance = nullptr; diff --git a/Telegram/SourceFiles/ui/widgets/tooltip.h b/Telegram/SourceFiles/ui/widgets/tooltip.h index 2db827fe7..49d570405 100644 --- a/Telegram/SourceFiles/ui/widgets/tooltip.h +++ b/Telegram/SourceFiles/ui/widgets/tooltip.h @@ -18,6 +18,9 @@ #pragma once #include "base/timer.h" +#include "ui/twidget.h" +#include "ui/text/text.h" +#include "ui/animation.h" namespace style { struct Tooltip; diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp index 0fb67aced..37337c920 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp @@ -28,6 +28,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mediaview.h" #include "messenger.h" #include "mainwindow.h" +#include "app.h" + +#include +#include +#include +#include +#include +#include +#include namespace Window { diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h index 28561cc7b..3c6c3785b 100644 --- a/Telegram/SourceFiles/window/main_window.h +++ b/Telegram/SourceFiles/window/main_window.h @@ -20,10 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include #include "window/window_title.h" #include "base/timer.h" class MediaView; +class TWidget; namespace Window { diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp index f0dbbe1a4..a44df89c3 100644 --- a/Telegram/SourceFiles/window/notifications_manager.cpp +++ b/Telegram/SourceFiles/window/notifications_manager.cpp @@ -29,6 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "apiwrap.h" #include "auth_session.h" +#include "app.h" namespace Window { namespace Notifications { diff --git a/Telegram/SourceFiles/window/notifications_manager.h b/Telegram/SourceFiles/window/notifications_manager.h index d10c2fb0b..ed380e268 100644 --- a/Telegram/SourceFiles/window/notifications_manager.h +++ b/Telegram/SourceFiles/window/notifications_manager.h @@ -20,7 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "base/observer.h" +#include "structs.h" +#include "core/single_timer.h" + class AuthSession; +class History; +class HistoryItem; namespace Platform { namespace Notifications { diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp index 8700a6fff..5e584fff2 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.cpp +++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp @@ -35,6 +35,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "storage/file_download.h" #include "auth_session.h" #include "platform/platform_specific.h" +#include "app.h" +#include "settings/settings_info_widget.h" +#include "facades.h" +#include "ui/animation.h" namespace Window { namespace Notifications { diff --git a/Telegram/SourceFiles/window/notifications_manager_default.h b/Telegram/SourceFiles/window/notifications_manager_default.h index 98db63a8f..6606d9011 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.h +++ b/Telegram/SourceFiles/window/notifications_manager_default.h @@ -20,8 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/observer.h" #include "window/notifications_manager.h" #include "core/single_timer.h" +#include "history/history_item.h" +#include "structs.h" +#include "ui/animation.h" + +class History; namespace Ui { class IconButton; diff --git a/Telegram/SourceFiles/window/player_wrap_widget.cpp b/Telegram/SourceFiles/window/player_wrap_widget.cpp index 1b81a818c..0b574e7ae 100644 --- a/Telegram/SourceFiles/window/player_wrap_widget.cpp +++ b/Telegram/SourceFiles/window/player_wrap_widget.cpp @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/player_wrap_widget.h" #include "ui/widgets/shadow.h" +#include "facades.h" namespace Window { diff --git a/Telegram/SourceFiles/window/section_memento.h b/Telegram/SourceFiles/window/section_memento.h index 839b0bceb..c2879695b 100644 --- a/Telegram/SourceFiles/window/section_memento.h +++ b/Telegram/SourceFiles/window/section_memento.h @@ -19,6 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/object_ptr.h" +#include namespace Window { @@ -27,7 +29,7 @@ class SectionWidget; class SectionMemento { public: - virtual object_ptr createWidget(QWidget *parent, not_null controller, const QRect &geometry) = 0; + virtual object_ptr createWidget(QWidget *parent, gsl::not_null controller, const QRect &geometry) = 0; virtual ~SectionMemento() { } diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp index 54e8c03d4..d7b229679 100644 --- a/Telegram/SourceFiles/window/section_widget.cpp +++ b/Telegram/SourceFiles/window/section_widget.cpp @@ -21,6 +21,12 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "window/section_widget.h" #include "application.h" +#include "ui/twidget.h" +#include "window_slide_animation.h" +#include "facades.h" + +#include +#include namespace Window { diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h index 480ec69b3..1c70aea69 100644 --- a/Telegram/SourceFiles/window/section_widget.h +++ b/Telegram/SourceFiles/window/section_widget.h @@ -20,6 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/observer.h" #include "ui/twidget.h" #include "window/window_slide_animation.h" diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp index 82ae7a8a3..5727677fb 100644 --- a/Telegram/SourceFiles/window/themes/window_theme.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme.cpp @@ -28,6 +28,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_history.h" #include "boxes/background_box.h" +#include +#include + namespace Window { namespace Theme { namespace { diff --git a/Telegram/SourceFiles/window/themes/window_theme.h b/Telegram/SourceFiles/window/themes/window_theme.h index 7265e90f1..2b5729a47 100644 --- a/Telegram/SourceFiles/window/themes/window_theme.h +++ b/Telegram/SourceFiles/window/themes/window_theme.h @@ -19,6 +19,10 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/observer.h" +#include "QImage" +#include "styles/palette.h" +#include "QPixmap" namespace Window { namespace Theme { diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp index 972bdb6ae..9c79f47ae 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp @@ -42,6 +42,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/edit_color_box.h" #include "lang/lang_keys.h" +#include "app.h" +#include "facades.h" + +#include + namespace Window { namespace Theme { namespace { diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.h b/Telegram/SourceFiles/window/themes/window_theme_editor.h index d5fd8dc58..5ccc3c92a 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor.h +++ b/Telegram/SourceFiles/window/themes/window_theme_editor.h @@ -20,6 +20,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "ui/twidget.h" +#include "ui/widgets/scroll_area.h" + +#include + +class QWidget; +class QString; +class QPaintEvent; +class QResizeEvent; +class QKeyEvent; +class QFocusEvent; + class BoxLayerTitleShadow; namespace Ui { diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp index 00cc5d0b2..2bde2444f 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.cpp @@ -24,6 +24,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/effects/ripple_animation.h" #include "boxes/edit_color_box.h" #include "lang/lang_keys.h" +#include "facades.h" + +#include +#include namespace Window { namespace Theme { diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.h b/Telegram/SourceFiles/window/themes/window_theme_editor_block.h index a7ba67448..33310432a 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.h +++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.h @@ -20,6 +20,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "ui/twidget.h" +#include "base/observer.h" + class EditColorBox; namespace Window { diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp index 950ca0729..295489150 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp @@ -28,6 +28,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "styles/style_mediaview.h" #include "styles/style_history.h" #include "styles/style_dialogs.h" +#include "ui/emoji_config.h" +#include "ui/text/text.h" +#include "layout.h" +#include "app.h" namespace Window { namespace Theme { diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.h b/Telegram/SourceFiles/window/themes/window_theme_preview.h index 9ed831fe4..ece147d47 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_preview.h +++ b/Telegram/SourceFiles/window/themes/window_theme_preview.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "window/themes/window_theme.h" +#include "QPixmap" namespace Window { namespace Theme { diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp index aa2feba2f..4d56d4818 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp @@ -25,6 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "ui/widgets/shadow.h" #include "window/themes/window_theme.h" #include "lang/lang_keys.h" +#include "app.h" namespace Window { namespace Theme { diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.h b/Telegram/SourceFiles/window/themes/window_theme_warning.h index ae450d715..0be4c310f 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_warning.h +++ b/Telegram/SourceFiles/window/themes/window_theme_warning.h @@ -20,6 +20,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include "base/lambda.h" +#include "base/object_ptr.h" +#include "core/single_timer.h" +#include "ui/twidget.h" + +#include +#include "ui/animation.h" + namespace Ui { class RoundButton; } // namespace Ui diff --git a/Telegram/SourceFiles/window/top_bar_widget.h b/Telegram/SourceFiles/window/top_bar_widget.h index 93b8ab3c3..074ee5728 100644 --- a/Telegram/SourceFiles/window/top_bar_widget.h +++ b/Telegram/SourceFiles/window/top_bar_widget.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "ui/twidget.h" +#include "ui/animation.h" namespace Ui { class PeerAvatarButton; diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h index 34b842190..5d5703989 100644 --- a/Telegram/SourceFiles/window/window_controller.h +++ b/Telegram/SourceFiles/window/window_controller.h @@ -21,6 +21,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "base/flags.h" +#include "base/observer.h" +#include "core/basic_types.h" + +#include "facades.h" namespace Window { diff --git a/Telegram/SourceFiles/window/window_main_menu.h b/Telegram/SourceFiles/window/window_main_menu.h index ed6f4f6e6..7aa32f91d 100644 --- a/Telegram/SourceFiles/window/window_main_menu.h +++ b/Telegram/SourceFiles/window/window_main_menu.h @@ -21,6 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include "base/timer.h" +#include "base/lambda.h" +#include "ui/twidget.h" namespace Ui { class IconButton; diff --git a/Telegram/SourceFiles/window/window_slide_animation.h b/Telegram/SourceFiles/window/window_slide_animation.h index ebbc77b7d..89b549c76 100644 --- a/Telegram/SourceFiles/window/window_slide_animation.h +++ b/Telegram/SourceFiles/window/window_slide_animation.h @@ -20,6 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include "base/lambda.h" +#include "ui/animation.h" +#include "ui/twidget.h" + namespace Window { enum class SlideDirection { diff --git a/Telegram/SourceFiles/window/window_title.h b/Telegram/SourceFiles/window/window_title.h index e2b3e3041..0469c520c 100644 --- a/Telegram/SourceFiles/window/window_title.h +++ b/Telegram/SourceFiles/window/window_title.h @@ -20,6 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +#include +#include +#include "ui/twidget.h" + namespace Window { enum class HitTestResult { diff --git a/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.cpp b/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.cpp index 6b3cd91f1..1a4aa261a 100644 --- a/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.cpp +++ b/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.cpp @@ -23,6 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include #include "emoji_suggestions_data.h" +#include + #ifndef Expects #include #define Expects(condition) assert(condition) diff --git a/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.h b/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.h index b13f0608e..20ebaa488 100644 --- a/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.h +++ b/Telegram/ThirdParty/emoji_suggestions/emoji_suggestions.h @@ -21,6 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #pragma once #include +#include namespace Ui { namespace Emoji { diff --git a/cotire/.gitattributes b/cotire/.gitattributes deleted file mode 100644 index d49e736b5..000000000 --- a/cotire/.gitattributes +++ /dev/null @@ -1,8 +0,0 @@ -*.sh eol=lf -bootstrap eol=lf -configure eol=lf -*.[1-9] eol=lf - -*.bat eol=crlf -*.cmd eol=crlf -*.vbs eol=crlf diff --git a/cotire/.gitignore b/cotire/.gitignore deleted file mode 100755 index d1243543c..000000000 --- a/cotire/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# ignore CMake build directories -*build*/ -.DS_Store -.project -.idea diff --git a/cotire/.gitrepo b/cotire/.gitrepo deleted file mode 100644 index f1c779246..000000000 --- a/cotire/.gitrepo +++ /dev/null @@ -1,11 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = https://github.com/sakra/cotire.git - branch = master - commit = 391bf6b7609e14f5976bd5247b68d63cbf8d4d12 - parent = 73ea43b04ff1f6ce614cb63765abad495bc08167 - cmdver = 0.3.1 diff --git a/cotire/CMake/cotire.cmake b/cotire/CMake/cotire.cmake deleted file mode 100644 index a92405d88..000000000 --- a/cotire/CMake/cotire.cmake +++ /dev/null @@ -1,4202 +0,0 @@ -# - cotire (compile time reducer) -# -# See the cotire manual for usage hints. -# -#============================================================================= -# Copyright 2012-2018 Sascha Kratky -# -# Permission is hereby granted, free of charge, to any person -# obtaining a copy of this software and associated documentation -# files (the "Software"), to deal in the Software without -# restriction, including without limitation the rights to use, -# copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following -# conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -#============================================================================= - -if(__COTIRE_INCLUDED) - return() -endif() -set(__COTIRE_INCLUDED TRUE) - -# call cmake_minimum_required, but prevent modification of the CMake policy stack in include mode -# cmake_minimum_required also sets the policy version as a side effect, which we have to avoid -if (NOT CMAKE_SCRIPT_MODE_FILE) - cmake_policy(PUSH) -endif() -cmake_minimum_required(VERSION 2.8.12) -if (NOT CMAKE_SCRIPT_MODE_FILE) - cmake_policy(POP) -endif() - -set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}") -set (COTIRE_CMAKE_MODULE_VERSION "1.8.0") - -# activate select policies -if (POLICY CMP0025) - # Compiler id for Apple Clang is now AppleClang - cmake_policy(SET CMP0025 NEW) -endif() - -if (POLICY CMP0026) - # disallow use of the LOCATION target property - cmake_policy(SET CMP0026 NEW) -endif() - -if (POLICY CMP0038) - # targets may not link directly to themselves - cmake_policy(SET CMP0038 NEW) -endif() - -if (POLICY CMP0039) - # utility targets may not have link dependencies - cmake_policy(SET CMP0039 NEW) -endif() - -if (POLICY CMP0040) - # target in the TARGET signature of add_custom_command() must exist - cmake_policy(SET CMP0040 NEW) -endif() - -if (POLICY CMP0045) - # error on non-existent target in get_target_property - cmake_policy(SET CMP0045 NEW) -endif() - -if (POLICY CMP0046) - # error on non-existent dependency in add_dependencies - cmake_policy(SET CMP0046 NEW) -endif() - -if (POLICY CMP0049) - # do not expand variables in target source entries - cmake_policy(SET CMP0049 NEW) -endif() - -if (POLICY CMP0050) - # disallow add_custom_command SOURCE signatures - cmake_policy(SET CMP0050 NEW) -endif() - -if (POLICY CMP0051) - # include TARGET_OBJECTS expressions in a target's SOURCES property - cmake_policy(SET CMP0051 NEW) -endif() - -if (POLICY CMP0053) - # simplify variable reference and escape sequence evaluation - cmake_policy(SET CMP0053 NEW) -endif() - -if (POLICY CMP0054) - # only interpret if() arguments as variables or keywords when unquoted - cmake_policy(SET CMP0054 NEW) -endif() - -if (POLICY CMP0055) - # strict checking for break() command - cmake_policy(SET CMP0055 NEW) -endif() - -include(CMakeParseArguments) -include(ProcessorCount) - -function (cotire_get_configuration_types _configsVar) - set (_configs "") - if (CMAKE_CONFIGURATION_TYPES) - list (APPEND _configs ${CMAKE_CONFIGURATION_TYPES}) - endif() - if (CMAKE_BUILD_TYPE) - list (APPEND _configs "${CMAKE_BUILD_TYPE}") - endif() - if (_configs) - list (REMOVE_DUPLICATES _configs) - set (${_configsVar} ${_configs} PARENT_SCOPE) - else() - set (${_configsVar} "None" PARENT_SCOPE) - endif() -endfunction() - -function (cotire_get_source_file_extension _sourceFile _extVar) - # get_filename_component returns extension from first occurrence of . in file name - # this function computes the extension from last occurrence of . in file name - string (FIND "${_sourceFile}" "." _index REVERSE) - if (_index GREATER -1) - math (EXPR _index "${_index} + 1") - string (SUBSTRING "${_sourceFile}" ${_index} -1 _sourceExt) - else() - set (_sourceExt "") - endif() - set (${_extVar} "${_sourceExt}" PARENT_SCOPE) -endfunction() - -macro (cotire_check_is_path_relative_to _path _isRelativeVar) - set (${_isRelativeVar} FALSE) - if (IS_ABSOLUTE "${_path}") - foreach (_dir ${ARGN}) - file (RELATIVE_PATH _relPath "${_dir}" "${_path}") - if (NOT _relPath OR (NOT IS_ABSOLUTE "${_relPath}" AND NOT "${_relPath}" MATCHES "^\\.\\.")) - set (${_isRelativeVar} TRUE) - break() - endif() - endforeach() - endif() -endmacro() - -function (cotire_filter_language_source_files _language _target _sourceFilesVar _excludedSourceFilesVar _cotiredSourceFilesVar) - if (CMAKE_${_language}_SOURCE_FILE_EXTENSIONS) - set (_languageExtensions "${CMAKE_${_language}_SOURCE_FILE_EXTENSIONS}") - else() - set (_languageExtensions "") - endif() - if (CMAKE_${_language}_IGNORE_EXTENSIONS) - set (_ignoreExtensions "${CMAKE_${_language}_IGNORE_EXTENSIONS}") - else() - set (_ignoreExtensions "") - endif() - if (COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS) - set (_excludeExtensions "${COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS}") - else() - set (_excludeExtensions "") - endif() - if (COTIRE_DEBUG AND _languageExtensions) - message (STATUS "${_language} source file extensions: ${_languageExtensions}") - endif() - if (COTIRE_DEBUG AND _ignoreExtensions) - message (STATUS "${_language} ignore extensions: ${_ignoreExtensions}") - endif() - if (COTIRE_DEBUG AND _excludeExtensions) - message (STATUS "${_language} exclude extensions: ${_excludeExtensions}") - endif() - if (CMAKE_VERSION VERSION_LESS "3.1.0") - set (_allSourceFiles ${ARGN}) - else() - # as of CMake 3.1 target sources may contain generator expressions - # since we cannot obtain required property information about source files added - # through generator expressions at configure time, we filter them out - string (GENEX_STRIP "${ARGN}" _allSourceFiles) - endif() - set (_filteredSourceFiles "") - set (_excludedSourceFiles "") - foreach (_sourceFile ${_allSourceFiles}) - get_source_file_property(_sourceIsHeaderOnly "${_sourceFile}" HEADER_FILE_ONLY) - get_source_file_property(_sourceIsExternal "${_sourceFile}" EXTERNAL_OBJECT) - get_source_file_property(_sourceIsSymbolic "${_sourceFile}" SYMBOLIC) - if (NOT _sourceIsHeaderOnly AND NOT _sourceIsExternal AND NOT _sourceIsSymbolic) - cotire_get_source_file_extension("${_sourceFile}" _sourceExt) - if (_sourceExt) - list (FIND _ignoreExtensions "${_sourceExt}" _ignoreIndex) - if (_ignoreIndex LESS 0) - list (FIND _excludeExtensions "${_sourceExt}" _excludeIndex) - if (_excludeIndex GREATER -1) - list (APPEND _excludedSourceFiles "${_sourceFile}") - else() - list (FIND _languageExtensions "${_sourceExt}" _sourceIndex) - if (_sourceIndex GREATER -1) - # consider source file unless it is excluded explicitly - get_source_file_property(_sourceIsExcluded "${_sourceFile}" COTIRE_EXCLUDED) - if (_sourceIsExcluded) - list (APPEND _excludedSourceFiles "${_sourceFile}") - else() - list (APPEND _filteredSourceFiles "${_sourceFile}") - endif() - else() - get_source_file_property(_sourceLanguage "${_sourceFile}" LANGUAGE) - if ("${_sourceLanguage}" STREQUAL "${_language}") - # add to excluded sources, if file is not ignored and has correct language without having the correct extension - list (APPEND _excludedSourceFiles "${_sourceFile}") - endif() - endif() - endif() - endif() - endif() - endif() - endforeach() - # separate filtered source files from already cotired ones - # the COTIRE_TARGET property of a source file may be set while a target is being processed by cotire - set (_sourceFiles "") - set (_cotiredSourceFiles "") - foreach (_sourceFile ${_filteredSourceFiles}) - get_source_file_property(_sourceIsCotired "${_sourceFile}" COTIRE_TARGET) - if (_sourceIsCotired) - list (APPEND _cotiredSourceFiles "${_sourceFile}") - else() - get_source_file_property(_sourceCompileFlags "${_sourceFile}" COMPILE_FLAGS) - if (_sourceCompileFlags) - # add to excluded sources, if file has custom compile flags - list (APPEND _excludedSourceFiles "${_sourceFile}") - else() - get_source_file_property(_sourceCompileOptions "${_sourceFile}" COMPILE_OPTIONS) - if (_sourceCompileOptions) - # add to excluded sources, if file has list of custom compile options - list (APPEND _excludedSourceFiles "${_sourceFile}") - else() - list (APPEND _sourceFiles "${_sourceFile}") - endif() - endif() - endif() - endforeach() - if (COTIRE_DEBUG) - if (_sourceFiles) - message (STATUS "Filtered ${_target} ${_language} sources: ${_sourceFiles}") - endif() - if (_excludedSourceFiles) - message (STATUS "Excluded ${_target} ${_language} sources: ${_excludedSourceFiles}") - endif() - if (_cotiredSourceFiles) - message (STATUS "Cotired ${_target} ${_language} sources: ${_cotiredSourceFiles}") - endif() - endif() - get_target_property(_targetAutoMoc ${_target} AUTOMOC) - get_target_property(_targetAutoUic ${_target} AUTOUIC) - get_target_property(_targetAutoRcc ${_target} AUTORCC) - if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc) - # if the original target sources are subject to CMake's automatic Qt processing, - # also include implicitly generated _automoc.cpp file - if (CMAKE_VERSION VERSION_LESS "3.8.0") - list (APPEND _sourceFiles "${CMAKE_CURRENT_BINARY_DIR}/${_target}_automoc.cpp") - else() - list (APPEND _sourceFiles "${CMAKE_CURRENT_BINARY_DIR}/${_target}_autogen/mocs_compilation.cpp") - endif() - endif() - set (${_sourceFilesVar} ${_sourceFiles} PARENT_SCOPE) - set (${_excludedSourceFilesVar} ${_excludedSourceFiles} PARENT_SCOPE) - set (${_cotiredSourceFilesVar} ${_cotiredSourceFiles} PARENT_SCOPE) -endfunction() - -function (cotire_get_objects_with_property_on _filteredObjectsVar _property _type) - set (_filteredObjects "") - foreach (_object ${ARGN}) - get_property(_isSet ${_type} "${_object}" PROPERTY ${_property} SET) - if (_isSet) - get_property(_propertyValue ${_type} "${_object}" PROPERTY ${_property}) - if (_propertyValue) - list (APPEND _filteredObjects "${_object}") - endif() - endif() - endforeach() - set (${_filteredObjectsVar} ${_filteredObjects} PARENT_SCOPE) -endfunction() - -function (cotire_get_objects_with_property_off _filteredObjectsVar _property _type) - set (_filteredObjects "") - foreach (_object ${ARGN}) - get_property(_isSet ${_type} "${_object}" PROPERTY ${_property} SET) - if (_isSet) - get_property(_propertyValue ${_type} "${_object}" PROPERTY ${_property}) - if (NOT _propertyValue) - list (APPEND _filteredObjects "${_object}") - endif() - endif() - endforeach() - set (${_filteredObjectsVar} ${_filteredObjects} PARENT_SCOPE) -endfunction() - -function (cotire_get_source_file_property_values _valuesVar _property) - set (_values "") - foreach (_sourceFile ${ARGN}) - get_source_file_property(_propertyValue "${_sourceFile}" ${_property}) - if (_propertyValue) - list (APPEND _values "${_propertyValue}") - endif() - endforeach() - set (${_valuesVar} ${_values} PARENT_SCOPE) -endfunction() - -function (cotire_resolve_config_properties _configurations _propertiesVar) - set (_properties "") - foreach (_property ${ARGN}) - if ("${_property}" MATCHES "") - foreach (_config ${_configurations}) - string (TOUPPER "${_config}" _upperConfig) - string (REPLACE "" "${_upperConfig}" _configProperty "${_property}") - list (APPEND _properties ${_configProperty}) - endforeach() - else() - list (APPEND _properties ${_property}) - endif() - endforeach() - set (${_propertiesVar} ${_properties} PARENT_SCOPE) -endfunction() - -function (cotire_copy_set_properties _configurations _type _source _target) - cotire_resolve_config_properties("${_configurations}" _properties ${ARGN}) - foreach (_property ${_properties}) - get_property(_isSet ${_type} ${_source} PROPERTY ${_property} SET) - if (_isSet) - get_property(_propertyValue ${_type} ${_source} PROPERTY ${_property}) - set_property(${_type} ${_target} PROPERTY ${_property} "${_propertyValue}") - endif() - endforeach() -endfunction() - -function (cotire_get_target_usage_requirements _target _config _targetRequirementsVar) - set (_targetRequirements "") - get_target_property(_librariesToProcess ${_target} LINK_LIBRARIES) - while (_librariesToProcess) - # remove from head - list (GET _librariesToProcess 0 _library) - list (REMOVE_AT _librariesToProcess 0) - if (_library MATCHES "^\\$<\\$:([A-Za-z0-9_:-]+)>$") - set (_library "${CMAKE_MATCH_1}") - elseif (_config STREQUAL "None" AND _library MATCHES "^\\$<\\$:([A-Za-z0-9_:-]+)>$") - set (_library "${CMAKE_MATCH_1}") - endif() - if (TARGET ${_library}) - list (FIND _targetRequirements ${_library} _index) - if (_index LESS 0) - list (APPEND _targetRequirements ${_library}) - # BFS traversal of transitive libraries - get_target_property(_libraries ${_library} INTERFACE_LINK_LIBRARIES) - if (_libraries) - list (APPEND _librariesToProcess ${_libraries}) - list (REMOVE_DUPLICATES _librariesToProcess) - endif() - endif() - endif() - endwhile() - set (${_targetRequirementsVar} ${_targetRequirements} PARENT_SCOPE) -endfunction() - -function (cotire_filter_compile_flags _language _flagFilter _matchedOptionsVar _unmatchedOptionsVar) - if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel") - set (_flagPrefix "[/-]") - else() - set (_flagPrefix "--?") - endif() - set (_optionFlag "") - set (_matchedOptions "") - set (_unmatchedOptions "") - foreach (_compileFlag ${ARGN}) - if (_compileFlag) - if (_optionFlag AND NOT "${_compileFlag}" MATCHES "^${_flagPrefix}") - # option with separate argument - list (APPEND _matchedOptions "${_compileFlag}") - set (_optionFlag "") - elseif ("${_compileFlag}" MATCHES "^(${_flagPrefix})(${_flagFilter})$") - # remember option - set (_optionFlag "${CMAKE_MATCH_2}") - elseif ("${_compileFlag}" MATCHES "^(${_flagPrefix})(${_flagFilter})(.+)$") - # option with joined argument - list (APPEND _matchedOptions "${CMAKE_MATCH_3}") - set (_optionFlag "") - else() - # flush remembered option - if (_optionFlag) - list (APPEND _matchedOptions "${_optionFlag}") - set (_optionFlag "") - endif() - # add to unfiltered options - list (APPEND _unmatchedOptions "${_compileFlag}") - endif() - endif() - endforeach() - if (_optionFlag) - list (APPEND _matchedOptions "${_optionFlag}") - endif() - if (COTIRE_DEBUG AND _matchedOptions) - message (STATUS "Filter ${_flagFilter} matched: ${_matchedOptions}") - endif() - if (COTIRE_DEBUG AND _unmatchedOptions) - message (STATUS "Filter ${_flagFilter} unmatched: ${_unmatchedOptions}") - endif() - set (${_matchedOptionsVar} ${_matchedOptions} PARENT_SCOPE) - set (${_unmatchedOptionsVar} ${_unmatchedOptions} PARENT_SCOPE) -endfunction() - -function (cotire_is_target_supported _target _isSupportedVar) - if (NOT TARGET "${_target}") - set (${_isSupportedVar} FALSE PARENT_SCOPE) - return() - endif() - get_target_property(_imported ${_target} IMPORTED) - if (_imported) - set (${_isSupportedVar} FALSE PARENT_SCOPE) - return() - endif() - get_target_property(_targetType ${_target} TYPE) - if (NOT _targetType MATCHES "EXECUTABLE|(STATIC|SHARED|MODULE|OBJECT)_LIBRARY") - set (${_isSupportedVar} FALSE PARENT_SCOPE) - return() - endif() - set (${_isSupportedVar} TRUE PARENT_SCOPE) -endfunction() - -function (cotire_get_target_compile_flags _config _language _target _flagsVar) - string (TOUPPER "${_config}" _upperConfig) - # collect options from CMake language variables - set (_compileFlags "") - if (CMAKE_${_language}_FLAGS) - set (_compileFlags "${_compileFlags} ${CMAKE_${_language}_FLAGS}") - endif() - if (CMAKE_${_language}_FLAGS_${_upperConfig}) - set (_compileFlags "${_compileFlags} ${CMAKE_${_language}_FLAGS_${_upperConfig}}") - endif() - if (_target) - # add target compile flags - get_target_property(_targetflags ${_target} COMPILE_FLAGS) - if (_targetflags) - set (_compileFlags "${_compileFlags} ${_targetflags}") - endif() - endif() - if (UNIX) - separate_arguments(_compileFlags UNIX_COMMAND "${_compileFlags}") - elseif(WIN32) - separate_arguments(_compileFlags WINDOWS_COMMAND "${_compileFlags}") - else() - separate_arguments(_compileFlags) - endif() - # target compile options - if (_target) - get_target_property(_targetOptions ${_target} COMPILE_OPTIONS) - if (_targetOptions) - list (APPEND _compileFlags ${_targetOptions}) - endif() - endif() - # interface compile options from linked library targets - if (_target) - set (_linkedTargets "") - cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets) - foreach (_linkedTarget ${_linkedTargets}) - get_target_property(_targetOptions ${_linkedTarget} INTERFACE_COMPILE_OPTIONS) - if (_targetOptions) - list (APPEND _compileFlags ${_targetOptions}) - endif() - endforeach() - endif() - # handle language standard properties - if (CMAKE_${_language}_STANDARD_DEFAULT) - # used compiler supports language standard levels - if (_target) - get_target_property(_targetLanguageStandard ${_target} ${_language}_STANDARD) - if (_targetLanguageStandard) - set (_type "EXTENSION") - get_property(_isSet TARGET ${_target} PROPERTY ${_language}_EXTENSIONS SET) - if (_isSet) - get_target_property(_targetUseLanguageExtensions ${_target} ${_language}_EXTENSIONS) - if (NOT _targetUseLanguageExtensions) - set (_type "STANDARD") - endif() - endif() - if (CMAKE_${_language}${_targetLanguageStandard}_${_type}_COMPILE_OPTION) - list (APPEND _compileFlags "${CMAKE_${_language}${_targetLanguageStandard}_${_type}_COMPILE_OPTION}") - endif() - endif() - endif() - endif() - # handle the POSITION_INDEPENDENT_CODE target property - if (_target) - get_target_property(_targetPIC ${_target} POSITION_INDEPENDENT_CODE) - if (_targetPIC) - get_target_property(_targetType ${_target} TYPE) - if (_targetType STREQUAL "EXECUTABLE" AND CMAKE_${_language}_COMPILE_OPTIONS_PIE) - list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_PIE}") - elseif (CMAKE_${_language}_COMPILE_OPTIONS_PIC) - list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_PIC}") - endif() - endif() - endif() - # handle visibility target properties - if (_target) - get_target_property(_targetVisibility ${_target} ${_language}_VISIBILITY_PRESET) - if (_targetVisibility AND CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY) - list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY}${_targetVisibility}") - endif() - get_target_property(_targetVisibilityInlines ${_target} VISIBILITY_INLINES_HIDDEN) - if (_targetVisibilityInlines AND CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN) - list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN}") - endif() - endif() - # platform specific flags - if (APPLE) - get_target_property(_architectures ${_target} OSX_ARCHITECTURES_${_upperConfig}) - if (NOT _architectures) - get_target_property(_architectures ${_target} OSX_ARCHITECTURES) - endif() - if (_architectures) - foreach (_arch ${_architectures}) - list (APPEND _compileFlags "-arch" "${_arch}") - endforeach() - endif() - if (CMAKE_OSX_SYSROOT) - if (CMAKE_${_language}_SYSROOT_FLAG) - list (APPEND _compileFlags "${CMAKE_${_language}_SYSROOT_FLAG}" "${CMAKE_OSX_SYSROOT}") - else() - list (APPEND _compileFlags "-isysroot" "${CMAKE_OSX_SYSROOT}") - endif() - endif() - if (CMAKE_OSX_DEPLOYMENT_TARGET) - if (CMAKE_${_language}_OSX_DEPLOYMENT_TARGET_FLAG) - list (APPEND _compileFlags "${CMAKE_${_language}_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}") - else() - list (APPEND _compileFlags "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") - endif() - endif() - endif() - if (COTIRE_DEBUG AND _compileFlags) - message (STATUS "Target ${_target} compile flags: ${_compileFlags}") - endif() - set (${_flagsVar} ${_compileFlags} PARENT_SCOPE) -endfunction() - -function (cotire_get_target_include_directories _config _language _target _includeDirsVar _systemIncludeDirsVar) - set (_includeDirs "") - set (_systemIncludeDirs "") - # default include dirs - if (CMAKE_INCLUDE_CURRENT_DIR) - list (APPEND _includeDirs "${CMAKE_CURRENT_BINARY_DIR}") - list (APPEND _includeDirs "${CMAKE_CURRENT_SOURCE_DIR}") - endif() - set (_targetFlags "") - cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags) - # parse additional include directories from target compile flags - if (CMAKE_INCLUDE_FLAG_${_language}) - string (STRIP "${CMAKE_INCLUDE_FLAG_${_language}}" _includeFlag) - string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}") - if (_includeFlag) - set (_dirs "") - cotire_filter_compile_flags("${_language}" "${_includeFlag}" _dirs _ignore ${_targetFlags}) - if (_dirs) - list (APPEND _includeDirs ${_dirs}) - endif() - endif() - endif() - # parse additional system include directories from target compile flags - if (CMAKE_INCLUDE_SYSTEM_FLAG_${_language}) - string (STRIP "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" _includeFlag) - string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}") - if (_includeFlag) - set (_dirs "") - cotire_filter_compile_flags("${_language}" "${_includeFlag}" _dirs _ignore ${_targetFlags}) - if (_dirs) - list (APPEND _systemIncludeDirs ${_dirs}) - endif() - endif() - endif() - # target include directories - get_directory_property(_dirs DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" INCLUDE_DIRECTORIES) - if (_target) - get_target_property(_targetDirs ${_target} INCLUDE_DIRECTORIES) - if (_targetDirs) - list (APPEND _dirs ${_targetDirs}) - endif() - get_target_property(_targetDirs ${_target} INTERFACE_SYSTEM_INCLUDE_DIRECTORIES) - if (_targetDirs) - list (APPEND _systemIncludeDirs ${_targetDirs}) - endif() - endif() - # interface include directories from linked library targets - if (_target) - set (_linkedTargets "") - cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets) - foreach (_linkedTarget ${_linkedTargets}) - get_target_property(_linkedTargetType ${_linkedTarget} TYPE) - if (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE AND NOT CMAKE_VERSION VERSION_LESS "3.4.0" AND - _linkedTargetType MATCHES "(STATIC|SHARED|MODULE|OBJECT)_LIBRARY") - # CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE refers to CMAKE_CURRENT_BINARY_DIR and CMAKE_CURRENT_SOURCE_DIR - # at the time, when the target was created. These correspond to the target properties BINARY_DIR and SOURCE_DIR - # which are only available with CMake 3.4 or later. - get_target_property(_targetDirs ${_linkedTarget} BINARY_DIR) - if (_targetDirs) - list (APPEND _dirs ${_targetDirs}) - endif() - get_target_property(_targetDirs ${_linkedTarget} SOURCE_DIR) - if (_targetDirs) - list (APPEND _dirs ${_targetDirs}) - endif() - endif() - get_target_property(_targetDirs ${_linkedTarget} INTERFACE_INCLUDE_DIRECTORIES) - if (_targetDirs) - list (APPEND _dirs ${_targetDirs}) - endif() - get_target_property(_targetDirs ${_linkedTarget} INTERFACE_SYSTEM_INCLUDE_DIRECTORIES) - if (_targetDirs) - list (APPEND _systemIncludeDirs ${_targetDirs}) - endif() - endforeach() - endif() - if (dirs) - list (REMOVE_DUPLICATES _dirs) - endif() - list (LENGTH _includeDirs _projectInsertIndex) - foreach (_dir ${_dirs}) - if (CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE) - cotire_check_is_path_relative_to("${_dir}" _isRelative "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}") - if (_isRelative) - list (LENGTH _includeDirs _len) - if (_len EQUAL _projectInsertIndex) - list (APPEND _includeDirs "${_dir}") - else() - list (INSERT _includeDirs _projectInsertIndex "${_dir}") - endif() - math (EXPR _projectInsertIndex "${_projectInsertIndex} + 1") - else() - list (APPEND _includeDirs "${_dir}") - endif() - else() - list (APPEND _includeDirs "${_dir}") - endif() - endforeach() - list (REMOVE_DUPLICATES _includeDirs) - list (REMOVE_DUPLICATES _systemIncludeDirs) - if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES) - list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES}) - endif() - if (WIN32 AND NOT MINGW) - # convert Windows paths in include directories to CMake paths - if (_includeDirs) - set (_paths "") - foreach (_dir ${_includeDirs}) - file (TO_CMAKE_PATH "${_dir}" _path) - list (APPEND _paths "${_path}") - endforeach() - set (_includeDirs ${_paths}) - endif() - if (_systemIncludeDirs) - set (_paths "") - foreach (_dir ${_systemIncludeDirs}) - file (TO_CMAKE_PATH "${_dir}" _path) - list (APPEND _paths "${_path}") - endforeach() - set (_systemIncludeDirs ${_paths}) - endif() - endif() - if (COTIRE_DEBUG AND _includeDirs) - message (STATUS "Target ${_target} include dirs: ${_includeDirs}") - endif() - set (${_includeDirsVar} ${_includeDirs} PARENT_SCOPE) - if (COTIRE_DEBUG AND _systemIncludeDirs) - message (STATUS "Target ${_target} system include dirs: ${_systemIncludeDirs}") - endif() - set (${_systemIncludeDirsVar} ${_systemIncludeDirs} PARENT_SCOPE) -endfunction() - -function (cotire_get_target_export_symbol _target _exportSymbolVar) - set (_exportSymbol "") - get_target_property(_targetType ${_target} TYPE) - get_target_property(_enableExports ${_target} ENABLE_EXPORTS) - if (_targetType MATCHES "(SHARED|MODULE)_LIBRARY" OR - (_targetType STREQUAL "EXECUTABLE" AND _enableExports)) - get_target_property(_exportSymbol ${_target} DEFINE_SYMBOL) - if (NOT _exportSymbol) - set (_exportSymbol "${_target}_EXPORTS") - endif() - string (MAKE_C_IDENTIFIER "${_exportSymbol}" _exportSymbol) - endif() - set (${_exportSymbolVar} ${_exportSymbol} PARENT_SCOPE) -endfunction() - -function (cotire_get_target_compile_definitions _config _language _target _definitionsVar) - string (TOUPPER "${_config}" _upperConfig) - set (_configDefinitions "") - # CMAKE_INTDIR for multi-configuration build systems - if (NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".") - list (APPEND _configDefinitions "CMAKE_INTDIR=\"${_config}\"") - endif() - # target export define symbol - cotire_get_target_export_symbol("${_target}" _defineSymbol) - if (_defineSymbol) - list (APPEND _configDefinitions "${_defineSymbol}") - endif() - # directory compile definitions - get_directory_property(_definitions DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMPILE_DEFINITIONS) - if (_definitions) - list (APPEND _configDefinitions ${_definitions}) - endif() - get_directory_property(_definitions DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMPILE_DEFINITIONS_${_upperConfig}) - if (_definitions) - list (APPEND _configDefinitions ${_definitions}) - endif() - # target compile definitions - get_target_property(_definitions ${_target} COMPILE_DEFINITIONS) - if (_definitions) - list (APPEND _configDefinitions ${_definitions}) - endif() - get_target_property(_definitions ${_target} COMPILE_DEFINITIONS_${_upperConfig}) - if (_definitions) - list (APPEND _configDefinitions ${_definitions}) - endif() - # interface compile definitions from linked library targets - set (_linkedTargets "") - cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets) - foreach (_linkedTarget ${_linkedTargets}) - get_target_property(_definitions ${_linkedTarget} INTERFACE_COMPILE_DEFINITIONS) - if (_definitions) - list (APPEND _configDefinitions ${_definitions}) - endif() - endforeach() - # parse additional compile definitions from target compile flags - # and do not look at directory compile definitions, which we already handled - set (_targetFlags "") - cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags) - cotire_filter_compile_flags("${_language}" "D" _definitions _ignore ${_targetFlags}) - if (_definitions) - list (APPEND _configDefinitions ${_definitions}) - endif() - list (REMOVE_DUPLICATES _configDefinitions) - if (COTIRE_DEBUG AND _configDefinitions) - message (STATUS "Target ${_target} compile definitions: ${_configDefinitions}") - endif() - set (${_definitionsVar} ${_configDefinitions} PARENT_SCOPE) -endfunction() - -function (cotire_get_target_compiler_flags _config _language _target _compilerFlagsVar) - # parse target compile flags omitting compile definitions and include directives - set (_targetFlags "") - cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags) - set (_flagFilter "D") - if (CMAKE_INCLUDE_FLAG_${_language}) - string (STRIP "${CMAKE_INCLUDE_FLAG_${_language}}" _includeFlag) - string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}") - if (_includeFlag) - set (_flagFilter "${_flagFilter}|${_includeFlag}") - endif() - endif() - if (CMAKE_INCLUDE_SYSTEM_FLAG_${_language}) - string (STRIP "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" _includeFlag) - string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}") - if (_includeFlag) - set (_flagFilter "${_flagFilter}|${_includeFlag}") - endif() - endif() - set (_compilerFlags "") - cotire_filter_compile_flags("${_language}" "${_flagFilter}" _ignore _compilerFlags ${_targetFlags}) - if (COTIRE_DEBUG AND _compilerFlags) - message (STATUS "Target ${_target} compiler flags: ${_compilerFlags}") - endif() - set (${_compilerFlagsVar} ${_compilerFlags} PARENT_SCOPE) -endfunction() - -function (cotire_add_sys_root_paths _pathsVar) - if (APPLE) - if (CMAKE_OSX_SYSROOT AND CMAKE_${_language}_HAS_ISYSROOT) - foreach (_path IN LISTS ${_pathsVar}) - if (IS_ABSOLUTE "${_path}") - get_filename_component(_path "${CMAKE_OSX_SYSROOT}/${_path}" ABSOLUTE) - if (EXISTS "${_path}") - list (APPEND ${_pathsVar} "${_path}") - endif() - endif() - endforeach() - endif() - endif() - set (${_pathsVar} ${${_pathsVar}} PARENT_SCOPE) -endfunction() - -function (cotire_get_source_extra_properties _sourceFile _pattern _resultVar) - set (_extraProperties ${ARGN}) - set (_result "") - if (_extraProperties) - list (FIND _extraProperties "${_sourceFile}" _index) - if (_index GREATER -1) - math (EXPR _index "${_index} + 1") - list (LENGTH _extraProperties _len) - math (EXPR _len "${_len} - 1") - foreach (_index RANGE ${_index} ${_len}) - list (GET _extraProperties ${_index} _value) - if (_value MATCHES "${_pattern}") - list (APPEND _result "${_value}") - else() - break() - endif() - endforeach() - endif() - endif() - set (${_resultVar} ${_result} PARENT_SCOPE) -endfunction() - -function (cotire_get_source_compile_definitions _config _language _sourceFile _definitionsVar) - set (_compileDefinitions "") - if (NOT CMAKE_SCRIPT_MODE_FILE) - string (TOUPPER "${_config}" _upperConfig) - get_source_file_property(_definitions "${_sourceFile}" COMPILE_DEFINITIONS) - if (_definitions) - list (APPEND _compileDefinitions ${_definitions}) - endif() - get_source_file_property(_definitions "${_sourceFile}" COMPILE_DEFINITIONS_${_upperConfig}) - if (_definitions) - list (APPEND _compileDefinitions ${_definitions}) - endif() - endif() - cotire_get_source_extra_properties("${_sourceFile}" "^[a-zA-Z0-9_]+(=.*)?$" _definitions ${ARGN}) - if (_definitions) - list (APPEND _compileDefinitions ${_definitions}) - endif() - if (COTIRE_DEBUG AND _compileDefinitions) - message (STATUS "Source ${_sourceFile} compile definitions: ${_compileDefinitions}") - endif() - set (${_definitionsVar} ${_compileDefinitions} PARENT_SCOPE) -endfunction() - -function (cotire_get_source_files_compile_definitions _config _language _definitionsVar) - set (_configDefinitions "") - foreach (_sourceFile ${ARGN}) - cotire_get_source_compile_definitions("${_config}" "${_language}" "${_sourceFile}" _sourceDefinitions) - if (_sourceDefinitions) - list (APPEND _configDefinitions "${_sourceFile}" ${_sourceDefinitions} "-") - endif() - endforeach() - set (${_definitionsVar} ${_configDefinitions} PARENT_SCOPE) -endfunction() - -function (cotire_get_source_undefs _sourceFile _property _sourceUndefsVar) - set (_sourceUndefs "") - if (NOT CMAKE_SCRIPT_MODE_FILE) - get_source_file_property(_undefs "${_sourceFile}" ${_property}) - if (_undefs) - list (APPEND _sourceUndefs ${_undefs}) - endif() - endif() - cotire_get_source_extra_properties("${_sourceFile}" "^[a-zA-Z0-9_]+$" _undefs ${ARGN}) - if (_undefs) - list (APPEND _sourceUndefs ${_undefs}) - endif() - if (COTIRE_DEBUG AND _sourceUndefs) - message (STATUS "Source ${_sourceFile} ${_property} undefs: ${_sourceUndefs}") - endif() - set (${_sourceUndefsVar} ${_sourceUndefs} PARENT_SCOPE) -endfunction() - -function (cotire_get_source_files_undefs _property _sourceUndefsVar) - set (_sourceUndefs "") - foreach (_sourceFile ${ARGN}) - cotire_get_source_undefs("${_sourceFile}" ${_property} _undefs) - if (_undefs) - list (APPEND _sourceUndefs "${_sourceFile}" ${_undefs} "-") - endif() - endforeach() - set (${_sourceUndefsVar} ${_sourceUndefs} PARENT_SCOPE) -endfunction() - -macro (cotire_set_cmd_to_prologue _cmdVar) - set (${_cmdVar} "${CMAKE_COMMAND}") - if (COTIRE_DEBUG) - list (APPEND ${_cmdVar} "--warn-uninitialized") - endif() - list (APPEND ${_cmdVar} "-DCOTIRE_BUILD_TYPE:STRING=$") - if (XCODE) - list (APPEND ${_cmdVar} "-DXCODE:BOOL=TRUE") - endif() - if (COTIRE_VERBOSE) - list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=ON") - elseif("${CMAKE_GENERATOR}" MATCHES "Makefiles") - list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=$(VERBOSE)") - endif() -endmacro() - -function (cotire_init_compile_cmd _cmdVar _language _compilerLauncher _compilerExe _compilerArg1) - if (NOT _compilerLauncher) - set (_compilerLauncher ${CMAKE_${_language}_COMPILER_LAUNCHER}) - endif() - if (NOT _compilerExe) - set (_compilerExe "${CMAKE_${_language}_COMPILER}") - endif() - if (NOT _compilerArg1) - set (_compilerArg1 ${CMAKE_${_language}_COMPILER_ARG1}) - endif() - if (WIN32) - file (TO_NATIVE_PATH "${_compilerExe}" _compilerExe) - endif() - string (STRIP "${_compilerArg1}" _compilerArg1) - if ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja") - # compiler launcher is only supported for Makefile and Ninja - set (${_cmdVar} ${_compilerLauncher} "${_compilerExe}" ${_compilerArg1} PARENT_SCOPE) - else() - set (${_cmdVar} "${_compilerExe}" ${_compilerArg1} PARENT_SCOPE) - endif() -endfunction() - -macro (cotire_add_definitions_to_cmd _cmdVar _language) - foreach (_definition ${ARGN}) - if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel") - list (APPEND ${_cmdVar} "/D${_definition}") - else() - list (APPEND ${_cmdVar} "-D${_definition}") - endif() - endforeach() -endmacro() - -function (cotire_add_includes_to_cmd _cmdVar _language _includesVar _systemIncludesVar) - set (_includeDirs ${${_includesVar}} ${${_systemIncludesVar}}) - if (_includeDirs) - list (REMOVE_DUPLICATES _includeDirs) - foreach (_include ${_includeDirs}) - if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel") - file (TO_NATIVE_PATH "${_include}" _include) - list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}") - else() - set (_index -1) - if ("${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" MATCHES ".+") - list (FIND ${_systemIncludesVar} "${_include}" _index) - endif() - if (_index GREATER -1) - list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}") - else() - list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}") - endif() - endif() - endforeach() - endif() - set (${_cmdVar} ${${_cmdVar}} PARENT_SCOPE) -endfunction() - -function (cotire_add_frameworks_to_cmd _cmdVar _language _includesVar _systemIncludesVar) - if (APPLE) - set (_frameworkDirs "") - foreach (_include ${${_includesVar}}) - if (IS_ABSOLUTE "${_include}" AND _include MATCHES "\\.framework$") - get_filename_component(_frameworkDir "${_include}" DIRECTORY) - list (APPEND _frameworkDirs "${_frameworkDir}") - endif() - endforeach() - set (_systemFrameworkDirs "") - foreach (_include ${${_systemIncludesVar}}) - if (IS_ABSOLUTE "${_include}" AND _include MATCHES "\\.framework$") - get_filename_component(_frameworkDir "${_include}" DIRECTORY) - list (APPEND _systemFrameworkDirs "${_frameworkDir}") - endif() - endforeach() - if (_systemFrameworkDirs) - list (APPEND _frameworkDirs ${_systemFrameworkDirs}) - endif() - if (_frameworkDirs) - list (REMOVE_DUPLICATES _frameworkDirs) - foreach (_frameworkDir ${_frameworkDirs}) - set (_index -1) - if ("${CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG}" MATCHES ".+") - list (FIND _systemFrameworkDirs "${_frameworkDir}" _index) - endif() - if (_index GREATER -1) - list (APPEND ${_cmdVar} "${CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG}${_frameworkDir}") - else() - list (APPEND ${_cmdVar} "${CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG}${_frameworkDir}") - endif() - endforeach() - endif() - endif() - set (${_cmdVar} ${${_cmdVar}} PARENT_SCOPE) -endfunction() - -macro (cotire_add_compile_flags_to_cmd _cmdVar) - foreach (_flag ${ARGN}) - list (APPEND ${_cmdVar} "${_flag}") - endforeach() -endmacro() - -function (cotire_check_file_up_to_date _fileIsUpToDateVar _file) - if (EXISTS "${_file}") - set (_triggerFile "") - foreach (_dependencyFile ${ARGN}) - if (EXISTS "${_dependencyFile}") - # IS_NEWER_THAN returns TRUE if both files have the same timestamp - # thus we do the comparison in both directions to exclude ties - if ("${_dependencyFile}" IS_NEWER_THAN "${_file}" AND - NOT "${_file}" IS_NEWER_THAN "${_dependencyFile}") - set (_triggerFile "${_dependencyFile}") - break() - endif() - endif() - endforeach() - if (_triggerFile) - if (COTIRE_VERBOSE) - get_filename_component(_fileName "${_file}" NAME) - message (STATUS "${_fileName} update triggered by ${_triggerFile} change.") - endif() - set (${_fileIsUpToDateVar} FALSE PARENT_SCOPE) - else() - if (COTIRE_VERBOSE) - get_filename_component(_fileName "${_file}" NAME) - message (STATUS "${_fileName} is up-to-date.") - endif() - set (${_fileIsUpToDateVar} TRUE PARENT_SCOPE) - endif() - else() - if (COTIRE_VERBOSE) - get_filename_component(_fileName "${_file}" NAME) - message (STATUS "${_fileName} does not exist yet.") - endif() - set (${_fileIsUpToDateVar} FALSE PARENT_SCOPE) - endif() -endfunction() - -macro (cotire_find_closest_relative_path _headerFile _includeDirs _relPathVar) - set (${_relPathVar} "") - foreach (_includeDir ${_includeDirs}) - if (IS_DIRECTORY "${_includeDir}") - file (RELATIVE_PATH _relPath "${_includeDir}" "${_headerFile}") - if (NOT IS_ABSOLUTE "${_relPath}" AND NOT "${_relPath}" MATCHES "^\\.\\.") - string (LENGTH "${${_relPathVar}}" _closestLen) - string (LENGTH "${_relPath}" _relLen) - if (_closestLen EQUAL 0 OR _relLen LESS _closestLen) - set (${_relPathVar} "${_relPath}") - endif() - endif() - elseif ("${_includeDir}" STREQUAL "${_headerFile}") - # if path matches exactly, return short non-empty string - set (${_relPathVar} "1") - break() - endif() - endforeach() -endmacro() - -macro (cotire_check_header_file_location _headerFile _insideIncludeDirs _outsideIncludeDirs _headerIsInside) - # check header path against ignored and honored include directories - cotire_find_closest_relative_path("${_headerFile}" "${_insideIncludeDirs}" _insideRelPath) - if (_insideRelPath) - # header is inside, but could be become outside if there is a shorter outside match - cotire_find_closest_relative_path("${_headerFile}" "${_outsideIncludeDirs}" _outsideRelPath) - if (_outsideRelPath) - string (LENGTH "${_insideRelPath}" _insideRelPathLen) - string (LENGTH "${_outsideRelPath}" _outsideRelPathLen) - if (_outsideRelPathLen LESS _insideRelPathLen) - set (${_headerIsInside} FALSE) - else() - set (${_headerIsInside} TRUE) - endif() - else() - set (${_headerIsInside} TRUE) - endif() - else() - # header is outside - set (${_headerIsInside} FALSE) - endif() -endmacro() - -macro (cotire_check_ignore_header_file_path _headerFile _headerIsIgnoredVar) - if (NOT EXISTS "${_headerFile}") - set (${_headerIsIgnoredVar} TRUE) - elseif (IS_DIRECTORY "${_headerFile}") - set (${_headerIsIgnoredVar} TRUE) - elseif ("${_headerFile}" MATCHES "\\.\\.|[_-]fixed" AND "${_headerFile}" MATCHES "\\.h$") - # heuristic: ignore C headers with embedded parent directory references or "-fixed" or "_fixed" in path - # these often stem from using GCC #include_next tricks, which may break the precompiled header compilation - # with the error message "error: no include path in which to search for header.h" - set (${_headerIsIgnoredVar} TRUE) - else() - set (${_headerIsIgnoredVar} FALSE) - endif() -endmacro() - -macro (cotire_check_ignore_header_file_ext _headerFile _ignoreExtensionsVar _headerIsIgnoredVar) - # check header file extension - cotire_get_source_file_extension("${_headerFile}" _headerFileExt) - set (${_headerIsIgnoredVar} FALSE) - if (_headerFileExt) - list (FIND ${_ignoreExtensionsVar} "${_headerFileExt}" _index) - if (_index GREATER -1) - set (${_headerIsIgnoredVar} TRUE) - endif() - endif() -endmacro() - -macro (cotire_parse_line _line _headerFileVar _headerDepthVar) - if (MSVC) - # cl.exe /showIncludes produces different output, depending on the language pack used, e.g.: - # English: "Note: including file: C:\directory\file" - # German: "Hinweis: Einlesen der Datei: C:\directory\file" - # We use a very general regular expression, relying on the presence of the : characters - if (_line MATCHES "( +)([a-zA-Z]:[^:]+)$") - string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar}) - get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" ABSOLUTE) - else() - set (${_headerFileVar} "") - set (${_headerDepthVar} 0) - endif() - else() - if (_line MATCHES "^(\\.+) (.*)$") - # GCC like output - string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar}) - if (IS_ABSOLUTE "${CMAKE_MATCH_2}") - set (${_headerFileVar} "${CMAKE_MATCH_2}") - else() - get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" REALPATH) - endif() - else() - set (${_headerFileVar} "") - set (${_headerDepthVar} 0) - endif() - endif() -endmacro() - -function (cotire_parse_includes _language _scanOutput _ignoredIncludeDirs _honoredIncludeDirs _ignoredExtensions _selectedIncludesVar _unparsedLinesVar) - if (WIN32) - # prevent CMake macro invocation errors due to backslash characters in Windows paths - string (REPLACE "\\" "/" _scanOutput "${_scanOutput}") - endif() - # canonize slashes - string (REPLACE "//" "/" _scanOutput "${_scanOutput}") - # prevent semicolon from being interpreted as a line separator - string (REPLACE ";" "\\;" _scanOutput "${_scanOutput}") - # then separate lines - string (REGEX REPLACE "\n" ";" _scanOutput "${_scanOutput}") - list (LENGTH _scanOutput _len) - # remove duplicate lines to speed up parsing - list (REMOVE_DUPLICATES _scanOutput) - list (LENGTH _scanOutput _uniqueLen) - if (COTIRE_VERBOSE OR COTIRE_DEBUG) - message (STATUS "Scanning ${_uniqueLen} unique lines of ${_len} for includes") - if (_ignoredExtensions) - message (STATUS "Ignored extensions: ${_ignoredExtensions}") - endif() - if (_ignoredIncludeDirs) - message (STATUS "Ignored paths: ${_ignoredIncludeDirs}") - endif() - if (_honoredIncludeDirs) - message (STATUS "Included paths: ${_honoredIncludeDirs}") - endif() - endif() - set (_sourceFiles ${ARGN}) - set (_selectedIncludes "") - set (_unparsedLines "") - # stack keeps track of inside/outside project status of processed header files - set (_headerIsInsideStack "") - foreach (_line IN LISTS _scanOutput) - if (_line) - cotire_parse_line("${_line}" _headerFile _headerDepth) - if (_headerFile) - cotire_check_header_file_location("${_headerFile}" "${_ignoredIncludeDirs}" "${_honoredIncludeDirs}" _headerIsInside) - if (COTIRE_DEBUG) - message (STATUS "${_headerDepth}: ${_headerFile} ${_headerIsInside}") - endif() - # update stack - list (LENGTH _headerIsInsideStack _stackLen) - if (_headerDepth GREATER _stackLen) - math (EXPR _stackLen "${_stackLen} + 1") - foreach (_index RANGE ${_stackLen} ${_headerDepth}) - list (APPEND _headerIsInsideStack ${_headerIsInside}) - endforeach() - else() - foreach (_index RANGE ${_headerDepth} ${_stackLen}) - list (REMOVE_AT _headerIsInsideStack -1) - endforeach() - list (APPEND _headerIsInsideStack ${_headerIsInside}) - endif() - if (COTIRE_DEBUG) - message (STATUS "${_headerIsInsideStack}") - endif() - # header is a candidate if it is outside project - if (NOT _headerIsInside) - # get parent header file's inside/outside status - if (_headerDepth GREATER 1) - math (EXPR _index "${_headerDepth} - 2") - list (GET _headerIsInsideStack ${_index} _parentHeaderIsInside) - else() - set (_parentHeaderIsInside TRUE) - endif() - # select header file if parent header file is inside project - # (e.g., a project header file that includes a standard header file) - if (_parentHeaderIsInside) - cotire_check_ignore_header_file_path("${_headerFile}" _headerIsIgnored) - if (NOT _headerIsIgnored) - cotire_check_ignore_header_file_ext("${_headerFile}" _ignoredExtensions _headerIsIgnored) - if (NOT _headerIsIgnored) - list (APPEND _selectedIncludes "${_headerFile}") - else() - # fix header's inside status on stack, it is ignored by extension now - list (REMOVE_AT _headerIsInsideStack -1) - list (APPEND _headerIsInsideStack TRUE) - endif() - endif() - if (COTIRE_DEBUG) - message (STATUS "${_headerFile} ${_ignoredExtensions} ${_headerIsIgnored}") - endif() - endif() - endif() - else() - if (MSVC) - # for cl.exe do not keep unparsed lines which solely consist of a source file name - string (FIND "${_sourceFiles}" "${_line}" _index) - if (_index LESS 0) - list (APPEND _unparsedLines "${_line}") - endif() - else() - list (APPEND _unparsedLines "${_line}") - endif() - endif() - endif() - endforeach() - list (REMOVE_DUPLICATES _selectedIncludes) - set (${_selectedIncludesVar} ${_selectedIncludes} PARENT_SCOPE) - set (${_unparsedLinesVar} ${_unparsedLines} PARENT_SCOPE) -endfunction() - -function (cotire_scan_includes _includesVar) - set(_options "") - set(_oneValueArgs COMPILER_ID COMPILER_EXECUTABLE COMPILER_ARG1 COMPILER_VERSION LANGUAGE UNPARSED_LINES SCAN_RESULT) - set(_multiValueArgs COMPILE_DEFINITIONS COMPILE_FLAGS INCLUDE_DIRECTORIES SYSTEM_INCLUDE_DIRECTORIES - IGNORE_PATH INCLUDE_PATH IGNORE_EXTENSIONS INCLUDE_PRIORITY_PATH COMPILER_LAUNCHER) - cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) - set (_sourceFiles ${_option_UNPARSED_ARGUMENTS}) - if (NOT _option_LANGUAGE) - set (_option_LANGUAGE "CXX") - endif() - if (NOT _option_COMPILER_ID) - set (_option_COMPILER_ID "${CMAKE_${_option_LANGUAGE}_ID}") - endif() - if (NOT _option_COMPILER_VERSION) - set (_option_COMPILER_VERSION "${CMAKE_${_option_LANGUAGE}_COMPILER_VERSION}") - endif() - cotire_init_compile_cmd(_cmd "${_option_LANGUAGE}" "${_option_COMPILER_LAUNCHER}" "${_option_COMPILER_EXECUTABLE}" "${_option_COMPILER_ARG1}") - cotire_add_definitions_to_cmd(_cmd "${_option_LANGUAGE}" ${_option_COMPILE_DEFINITIONS}) - cotire_add_compile_flags_to_cmd(_cmd ${_option_COMPILE_FLAGS}) - cotire_add_includes_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES) - cotire_add_frameworks_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES) - cotire_add_makedep_flags("${_option_LANGUAGE}" "${_option_COMPILER_ID}" "${_option_COMPILER_VERSION}" _cmd) - # only consider existing source files for scanning - set (_existingSourceFiles "") - foreach (_sourceFile ${_sourceFiles}) - if (EXISTS "${_sourceFile}") - list (APPEND _existingSourceFiles "${_sourceFile}") - endif() - endforeach() - if (NOT _existingSourceFiles) - set (${_includesVar} "" PARENT_SCOPE) - return() - endif() - # add source files to be scanned - if (WIN32) - foreach (_sourceFile ${_existingSourceFiles}) - file (TO_NATIVE_PATH "${_sourceFile}" _sourceFileNative) - list (APPEND _cmd "${_sourceFileNative}") - endforeach() - else() - list (APPEND _cmd ${_existingSourceFiles}) - endif() - if (COTIRE_VERBOSE) - message (STATUS "execute_process: ${_cmd}") - endif() - if (MSVC_IDE OR _option_COMPILER_ID MATCHES "MSVC") - # cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared - unset (ENV{VS_UNICODE_OUTPUT}) - endif() - execute_process( - COMMAND ${_cmd} - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - RESULT_VARIABLE _result - OUTPUT_QUIET - ERROR_VARIABLE _output) - if (_result) - message (STATUS "Result ${_result} scanning includes of ${_existingSourceFiles}.") - endif() - cotire_parse_includes( - "${_option_LANGUAGE}" "${_output}" - "${_option_IGNORE_PATH}" "${_option_INCLUDE_PATH}" - "${_option_IGNORE_EXTENSIONS}" - _includes _unparsedLines - ${_sourceFiles}) - if (_option_INCLUDE_PRIORITY_PATH) - set (_sortedIncludes "") - foreach (_priorityPath ${_option_INCLUDE_PRIORITY_PATH}) - foreach (_include ${_includes}) - string (FIND ${_include} ${_priorityPath} _position) - if (_position GREATER -1) - list (APPEND _sortedIncludes ${_include}) - endif() - endforeach() - endforeach() - if (_sortedIncludes) - list (INSERT _includes 0 ${_sortedIncludes}) - list (REMOVE_DUPLICATES _includes) - endif() - endif() - set (${_includesVar} ${_includes} PARENT_SCOPE) - if (_option_UNPARSED_LINES) - set (${_option_UNPARSED_LINES} ${_unparsedLines} PARENT_SCOPE) - endif() - if (_option_SCAN_RESULT) - set (${_option_SCAN_RESULT} ${_result} PARENT_SCOPE) - endif() -endfunction() - -macro (cotire_append_undefs _contentsVar) - set (_undefs ${ARGN}) - if (_undefs) - list (REMOVE_DUPLICATES _undefs) - foreach (_definition ${_undefs}) - list (APPEND ${_contentsVar} "#undef ${_definition}") - endforeach() - endif() -endmacro() - -macro (cotire_comment_str _language _commentText _commentVar) - if ("${_language}" STREQUAL "CMAKE") - set (${_commentVar} "# ${_commentText}") - else() - set (${_commentVar} "/* ${_commentText} */") - endif() -endmacro() - -function (cotire_write_file _language _file _contents _force) - get_filename_component(_moduleName "${COTIRE_CMAKE_MODULE_FILE}" NAME) - cotire_comment_str("${_language}" "${_moduleName} ${COTIRE_CMAKE_MODULE_VERSION} generated file" _header1) - cotire_comment_str("${_language}" "${_file}" _header2) - set (_contents "${_header1}\n${_header2}\n${_contents}") - if (COTIRE_DEBUG) - message (STATUS "${_contents}") - endif() - if (_force OR NOT EXISTS "${_file}") - file (WRITE "${_file}" "${_contents}") - else() - file (READ "${_file}" _oldContents) - if (NOT "${_oldContents}" STREQUAL "${_contents}") - file (WRITE "${_file}" "${_contents}") - else() - if (COTIRE_DEBUG) - message (STATUS "${_file} unchanged") - endif() - endif() - endif() -endfunction() - -function (cotire_generate_unity_source _unityFile) - set(_options "") - set(_oneValueArgs LANGUAGE) - set(_multiValueArgs - DEPENDS SOURCES_COMPILE_DEFINITIONS - PRE_UNDEFS SOURCES_PRE_UNDEFS POST_UNDEFS SOURCES_POST_UNDEFS PROLOGUE EPILOGUE) - cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) - if (_option_DEPENDS) - cotire_check_file_up_to_date(_unityFileIsUpToDate "${_unityFile}" ${_option_DEPENDS}) - if (_unityFileIsUpToDate) - return() - endif() - endif() - set (_sourceFiles ${_option_UNPARSED_ARGUMENTS}) - if (NOT _option_PRE_UNDEFS) - set (_option_PRE_UNDEFS "") - endif() - if (NOT _option_SOURCES_PRE_UNDEFS) - set (_option_SOURCES_PRE_UNDEFS "") - endif() - if (NOT _option_POST_UNDEFS) - set (_option_POST_UNDEFS "") - endif() - if (NOT _option_SOURCES_POST_UNDEFS) - set (_option_SOURCES_POST_UNDEFS "") - endif() - set (_contents "") - if (_option_PROLOGUE) - list (APPEND _contents ${_option_PROLOGUE}) - endif() - if (_option_LANGUAGE AND _sourceFiles) - if ("${_option_LANGUAGE}" STREQUAL "CXX") - list (APPEND _contents "#ifdef __cplusplus") - elseif ("${_option_LANGUAGE}" STREQUAL "C") - list (APPEND _contents "#ifndef __cplusplus") - endif() - endif() - set (_compileUndefinitions "") - foreach (_sourceFile ${_sourceFiles}) - cotire_get_source_compile_definitions( - "${_option_CONFIGURATION}" "${_option_LANGUAGE}" "${_sourceFile}" _compileDefinitions - ${_option_SOURCES_COMPILE_DEFINITIONS}) - cotire_get_source_undefs("${_sourceFile}" COTIRE_UNITY_SOURCE_PRE_UNDEFS _sourcePreUndefs ${_option_SOURCES_PRE_UNDEFS}) - cotire_get_source_undefs("${_sourceFile}" COTIRE_UNITY_SOURCE_POST_UNDEFS _sourcePostUndefs ${_option_SOURCES_POST_UNDEFS}) - if (_option_PRE_UNDEFS) - list (APPEND _compileUndefinitions ${_option_PRE_UNDEFS}) - endif() - if (_sourcePreUndefs) - list (APPEND _compileUndefinitions ${_sourcePreUndefs}) - endif() - if (_compileUndefinitions) - cotire_append_undefs(_contents ${_compileUndefinitions}) - set (_compileUndefinitions "") - endif() - if (_sourcePostUndefs) - list (APPEND _compileUndefinitions ${_sourcePostUndefs}) - endif() - if (_option_POST_UNDEFS) - list (APPEND _compileUndefinitions ${_option_POST_UNDEFS}) - endif() - foreach (_definition ${_compileDefinitions}) - if (_definition MATCHES "^([a-zA-Z0-9_]+)=(.+)$") - list (APPEND _contents "#define ${CMAKE_MATCH_1} ${CMAKE_MATCH_2}") - list (INSERT _compileUndefinitions 0 "${CMAKE_MATCH_1}") - else() - list (APPEND _contents "#define ${_definition}") - list (INSERT _compileUndefinitions 0 "${_definition}") - endif() - endforeach() - # use absolute path as source file location - get_filename_component(_sourceFileLocation "${_sourceFile}" ABSOLUTE) - if (WIN32) - file (TO_NATIVE_PATH "${_sourceFileLocation}" _sourceFileLocation) - endif() - list (APPEND _contents "#include \"${_sourceFileLocation}\"") - endforeach() - if (_compileUndefinitions) - cotire_append_undefs(_contents ${_compileUndefinitions}) - set (_compileUndefinitions "") - endif() - if (_option_LANGUAGE AND _sourceFiles) - list (APPEND _contents "#endif") - endif() - if (_option_EPILOGUE) - list (APPEND _contents ${_option_EPILOGUE}) - endif() - list (APPEND _contents "") - string (REPLACE ";" "\n" _contents "${_contents}") - if (COTIRE_VERBOSE) - message ("${_contents}") - endif() - cotire_write_file("${_option_LANGUAGE}" "${_unityFile}" "${_contents}" TRUE) -endfunction() - -function (cotire_generate_prefix_header _prefixFile) - set(_options "") - set(_oneValueArgs LANGUAGE COMPILER_EXECUTABLE COMPILER_ARG1 COMPILER_ID COMPILER_VERSION) - set(_multiValueArgs DEPENDS COMPILE_DEFINITIONS COMPILE_FLAGS - INCLUDE_DIRECTORIES SYSTEM_INCLUDE_DIRECTORIES IGNORE_PATH INCLUDE_PATH - IGNORE_EXTENSIONS INCLUDE_PRIORITY_PATH COMPILER_LAUNCHER) - cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) - if (NOT _option_COMPILER_ID) - set (_option_COMPILER_ID "${CMAKE_${_option_LANGUAGE}_ID}") - endif() - if (NOT _option_COMPILER_VERSION) - set (_option_COMPILER_VERSION "${CMAKE_${_option_LANGUAGE}_COMPILER_VERSION}") - endif() - if (_option_DEPENDS) - cotire_check_file_up_to_date(_prefixFileIsUpToDate "${_prefixFile}" ${_option_DEPENDS}) - if (_prefixFileIsUpToDate) - # create empty log file - set (_unparsedLinesFile "${_prefixFile}.log") - file (WRITE "${_unparsedLinesFile}" "") - return() - endif() - endif() - set (_prologue "") - set (_epilogue "") - if (_option_COMPILER_ID MATCHES "Clang") - set (_prologue "#pragma clang system_header") - elseif (_option_COMPILER_ID MATCHES "GNU") - set (_prologue "#pragma GCC system_header") - elseif (_option_COMPILER_ID MATCHES "MSVC") - set (_prologue "#pragma warning(push, 0)") - set (_epilogue "#pragma warning(pop)") - elseif (_option_COMPILER_ID MATCHES "Intel") - # Intel compiler requires hdrstop pragma to stop generating PCH file - set (_epilogue "#pragma hdrstop") - endif() - set (_sourceFiles ${_option_UNPARSED_ARGUMENTS}) - cotire_scan_includes(_selectedHeaders ${_sourceFiles} - LANGUAGE "${_option_LANGUAGE}" - COMPILER_LAUNCHER "${_option_COMPILER_LAUNCHER}" - COMPILER_EXECUTABLE "${_option_COMPILER_EXECUTABLE}" - COMPILER_ARG1 "${_option_COMPILER_ARG1}" - COMPILER_ID "${_option_COMPILER_ID}" - COMPILER_VERSION "${_option_COMPILER_VERSION}" - COMPILE_DEFINITIONS ${_option_COMPILE_DEFINITIONS} - COMPILE_FLAGS ${_option_COMPILE_FLAGS} - INCLUDE_DIRECTORIES ${_option_INCLUDE_DIRECTORIES} - SYSTEM_INCLUDE_DIRECTORIES ${_option_SYSTEM_INCLUDE_DIRECTORIES} - IGNORE_PATH ${_option_IGNORE_PATH} - INCLUDE_PATH ${_option_INCLUDE_PATH} - IGNORE_EXTENSIONS ${_option_IGNORE_EXTENSIONS} - INCLUDE_PRIORITY_PATH ${_option_INCLUDE_PRIORITY_PATH} - UNPARSED_LINES _unparsedLines - SCAN_RESULT _scanResult) - cotire_generate_unity_source("${_prefixFile}" - PROLOGUE ${_prologue} EPILOGUE ${_epilogue} LANGUAGE "${_option_LANGUAGE}" ${_selectedHeaders}) - set (_unparsedLinesFile "${_prefixFile}.log") - if (_unparsedLines) - if (COTIRE_VERBOSE OR _scanResult OR NOT _selectedHeaders) - list (LENGTH _unparsedLines _skippedLineCount) - if (WIN32) - file (TO_NATIVE_PATH "${_unparsedLinesFile}" _unparsedLinesLogPath) - else() - set (_unparsedLinesLogPath "${_unparsedLinesFile}") - endif() - message (STATUS "${_skippedLineCount} line(s) skipped, see ${_unparsedLinesLogPath}") - endif() - string (REPLACE ";" "\n" _unparsedLines "${_unparsedLines}") - endif() - file (WRITE "${_unparsedLinesFile}" "${_unparsedLines}\n") -endfunction() - -function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flagsVar) - set (_flags ${${_flagsVar}}) - if (_compilerID MATCHES "MSVC") - # cl.exe options used - # /nologo suppresses display of sign-on banner - # /TC treat all files named on the command line as C source files - # /TP treat all files named on the command line as C++ source files - # /EP preprocess to stdout without #line directives - # /showIncludes list include files - set (_sourceFileTypeC "/TC") - set (_sourceFileTypeCXX "/TP") - if (_flags) - # append to list - list (APPEND _flags /nologo "${_sourceFileType${_language}}" /EP /showIncludes) - else() - # return as a flag string - set (_flags "${_sourceFileType${_language}} /EP /showIncludes") - endif() - elseif (_compilerID MATCHES "GNU") - # GCC options used - # -H print the name of each header file used - # -E invoke preprocessor - # -fdirectives-only do not expand macros, requires GCC >= 4.3 - if (_flags) - # append to list - list (APPEND _flags -H -E) - if (NOT "${_compilerVersion}" VERSION_LESS "4.3.0") - list (APPEND _flags -fdirectives-only) - endif() - else() - # return as a flag string - set (_flags "-H -E") - if (NOT "${_compilerVersion}" VERSION_LESS "4.3.0") - set (_flags "${_flags} -fdirectives-only") - endif() - endif() - elseif (_compilerID MATCHES "Clang") - if (UNIX) - # Clang options used - # -H print the name of each header file used - # -E invoke preprocessor - # -fno-color-diagnostics do not print diagnostics in color - # -Eonly just run preprocessor, no output - if (_flags) - # append to list - list (APPEND _flags -H -E -fno-color-diagnostics -Xclang -Eonly) - else() - # return as a flag string - set (_flags "-H -E -fno-color-diagnostics -Xclang -Eonly") - endif() - elseif (WIN32) - # Clang-cl.exe options used - # /TC treat all files named on the command line as C source files - # /TP treat all files named on the command line as C++ source files - # /EP preprocess to stdout without #line directives - # -H print the name of each header file used - # -fno-color-diagnostics do not print diagnostics in color - # -Eonly just run preprocessor, no output - set (_sourceFileTypeC "/TC") - set (_sourceFileTypeCXX "/TP") - if (_flags) - # append to list - list (APPEND _flags "${_sourceFileType${_language}}" /EP -fno-color-diagnostics -Xclang -H -Xclang -Eonly) - else() - # return as a flag string - set (_flags "${_sourceFileType${_language}} /EP -fno-color-diagnostics -Xclang -H -Xclang -Eonly") - endif() - endif() - elseif (_compilerID MATCHES "Intel") - if (WIN32) - # Windows Intel options used - # /nologo do not display compiler version information - # /QH display the include file order - # /EP preprocess to stdout, omitting #line directives - # /TC process all source or unrecognized file types as C source files - # /TP process all source or unrecognized file types as C++ source files - set (_sourceFileTypeC "/TC") - set (_sourceFileTypeCXX "/TP") - if (_flags) - # append to list - list (APPEND _flags /nologo "${_sourceFileType${_language}}" /EP /QH) - else() - # return as a flag string - set (_flags "${_sourceFileType${_language}} /EP /QH") - endif() - else() - # Linux / Mac OS X Intel options used - # -H print the name of each header file used - # -EP preprocess to stdout, omitting #line directives - # -Kc++ process all source or unrecognized file types as C++ source files - if (_flags) - # append to list - if ("${_language}" STREQUAL "CXX") - list (APPEND _flags -Kc++) - endif() - list (APPEND _flags -H -EP) - else() - # return as a flag string - if ("${_language}" STREQUAL "CXX") - set (_flags "-Kc++ ") - endif() - set (_flags "${_flags}-H -EP") - endif() - endif() - else() - message (FATAL_ERROR "cotire: unsupported ${_language} compiler ${_compilerID} version ${_compilerVersion}.") - endif() - set (${_flagsVar} ${_flags} PARENT_SCOPE) -endfunction() - -function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersion _prefixFile _pchFile _hostFile _flagsVar) - set (_flags ${${_flagsVar}}) - if (_compilerID MATCHES "MSVC") - file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative) - file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative) - file (TO_NATIVE_PATH "${_hostFile}" _hostFileNative) - # cl.exe options used - # /Yc creates a precompiled header file - # /Fp specifies precompiled header binary file name - # /FI forces inclusion of file - # /TC treat all files named on the command line as C source files - # /TP treat all files named on the command line as C++ source files - # /Zs syntax check only - # /Zm precompiled header memory allocation scaling factor - set (_sourceFileTypeC "/TC") - set (_sourceFileTypeCXX "/TP") - if (_flags) - # append to list - list (APPEND _flags /nologo "${_sourceFileType${_language}}" - "/Yc${_prefixFileNative}" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}" /Zs "${_hostFileNative}") - if (COTIRE_PCH_MEMORY_SCALING_FACTOR) - list (APPEND _flags "/Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}") - endif() - else() - # return as a flag string - set (_flags "/Yc\"${_prefixFileNative}\" /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"") - if (COTIRE_PCH_MEMORY_SCALING_FACTOR) - set (_flags "${_flags} /Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}") - endif() - endif() - elseif (_compilerID MATCHES "GNU") - # GCC options used - # -x specify the source language - # -c compile but do not link - # -o place output in file - # note that we cannot use -w to suppress all warnings upon pre-compiling, because turning off a warning may - # alter compile flags as a side effect (e.g., -Wwrite-string implies -fconst-strings) - set (_xLanguage_C "c-header") - set (_xLanguage_CXX "c++-header") - if (_flags) - # append to list - list (APPEND _flags -x "${_xLanguage_${_language}}" -c "${_prefixFile}" -o "${_pchFile}") - else() - # return as a flag string - set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"") - endif() - elseif (_compilerID MATCHES "Clang") - if (UNIX) - # Clang options used - # -x specify the source language - # -c compile but do not link - # -o place output in file - # -fno-pch-timestamp disable inclusion of timestamp in precompiled headers (clang 4.0.0+) - set (_xLanguage_C "c-header") - set (_xLanguage_CXX "c++-header") - if (_flags) - # append to list - list (APPEND _flags -x "${_xLanguage_${_language}}" -c "${_prefixFile}" -o "${_pchFile}") - if (NOT "${_compilerVersion}" VERSION_LESS "4.0.0") - list (APPEND _flags -Xclang -fno-pch-timestamp) - endif() - else() - # return as a flag string - set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"") - if (NOT "${_compilerVersion}" VERSION_LESS "4.0.0") - set (_flags "${_flags} -Xclang -fno-pch-timestamp") - endif() - endif() - elseif (WIN32) - # Clang-cl.exe options used - # /Yc creates a precompiled header file - # /Fp specifies precompiled header binary file name - # /FI forces inclusion of file - # /Zs syntax check only - # /TC treat all files named on the command line as C source files - # /TP treat all files named on the command line as C++ source files - set (_sourceFileTypeC "/TC") - set (_sourceFileTypeCXX "/TP") - if (_flags) - # append to list - list (APPEND _flags "${_sourceFileType${_language}}" - "/Yc${_prefixFile}" "/Fp${_pchFile}" "/FI${_prefixFile}" /Zs "${_hostFile}") - else() - # return as a flag string - set (_flags "/Yc\"${_prefixFile}\" /Fp\"${_pchFile}\" /FI\"${_prefixFile}\"") - endif() - endif() - elseif (_compilerID MATCHES "Intel") - if (WIN32) - file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative) - file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative) - file (TO_NATIVE_PATH "${_hostFile}" _hostFileNative) - # Windows Intel options used - # /nologo do not display compiler version information - # /Yc create a precompiled header (PCH) file - # /Fp specify a path or file name for precompiled header files - # /FI tells the preprocessor to include a specified file name as the header file - # /TC process all source or unrecognized file types as C source files - # /TP process all source or unrecognized file types as C++ source files - # /Zs syntax check only - # /Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2) - set (_sourceFileTypeC "/TC") - set (_sourceFileTypeCXX "/TP") - if (_flags) - # append to list - list (APPEND _flags /nologo "${_sourceFileType${_language}}" - "/Yc" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}" /Zs "${_hostFileNative}") - if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - list (APPEND _flags "/Wpch-messages") - endif() - else() - # return as a flag string - set (_flags "/Yc /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"") - if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - set (_flags "${_flags} /Wpch-messages") - endif() - endif() - else() - # Linux / Mac OS X Intel options used - # -pch-dir location for precompiled header files - # -pch-create name of the precompiled header (PCH) to create - # -Kc++ process all source or unrecognized file types as C++ source files - # -fsyntax-only check only for correct syntax - # -Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2) - get_filename_component(_pchDir "${_pchFile}" DIRECTORY) - get_filename_component(_pchName "${_pchFile}" NAME) - set (_xLanguage_C "c-header") - set (_xLanguage_CXX "c++-header") - set (_pchSuppressMessages FALSE) - if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*") - set(_pchSuppressMessages TRUE) - endif() - if (_flags) - # append to list - if ("${_language}" STREQUAL "CXX") - list (APPEND _flags -Kc++) - endif() - list (APPEND _flags -include "${_prefixFile}" -pch-dir "${_pchDir}" -pch-create "${_pchName}" -fsyntax-only "${_hostFile}") - if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - if (NOT _pchSuppressMessages) - list (APPEND _flags -Wpch-messages) - endif() - endif() - else() - # return as a flag string - set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-create \"${_pchName}\"") - if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - if (NOT _pchSuppressMessages) - set (_flags "${_flags} -Wpch-messages") - endif() - endif() - endif() - endif() - else() - message (FATAL_ERROR "cotire: unsupported ${_language} compiler ${_compilerID} version ${_compilerVersion}.") - endif() - set (${_flagsVar} ${_flags} PARENT_SCOPE) -endfunction() - -function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerVersion _prefixFile _pchFile _flagsVar) - set (_flags ${${_flagsVar}}) - if (_compilerID MATCHES "MSVC") - file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative) - # cl.exe options used - # /Yu uses a precompiled header file during build - # /Fp specifies precompiled header binary file name - # /FI forces inclusion of file - # /Zm precompiled header memory allocation scaling factor - if (_pchFile) - file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative) - if (_flags) - # append to list - list (APPEND _flags "/Yu${_prefixFileNative}" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}") - if (COTIRE_PCH_MEMORY_SCALING_FACTOR) - list (APPEND _flags "/Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}") - endif() - else() - # return as a flag string - set (_flags "/Yu\"${_prefixFileNative}\" /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"") - if (COTIRE_PCH_MEMORY_SCALING_FACTOR) - set (_flags "${_flags} /Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}") - endif() - endif() - else() - # no precompiled header, force inclusion of prefix header - if (_flags) - # append to list - list (APPEND _flags "/FI${_prefixFileNative}") - else() - # return as a flag string - set (_flags "/FI\"${_prefixFileNative}\"") - endif() - endif() - elseif (_compilerID MATCHES "GNU") - # GCC options used - # -include process include file as the first line of the primary source file - # -Winvalid-pch warns if precompiled header is found but cannot be used - # note: ccache requires the -include flag to be used in order to process precompiled header correctly - if (_flags) - # append to list - list (APPEND _flags -Winvalid-pch -include "${_prefixFile}") - else() - # return as a flag string - set (_flags "-Winvalid-pch -include \"${_prefixFile}\"") - endif() - elseif (_compilerID MATCHES "Clang") - if (UNIX) - # Clang options used - # -include process include file as the first line of the primary source file - # note: ccache requires the -include flag to be used in order to process precompiled header correctly - if (_flags) - # append to list - list (APPEND _flags -include "${_prefixFile}") - else() - # return as a flag string - set (_flags "-include \"${_prefixFile}\"") - endif() - elseif (WIN32) - # Clang-cl.exe options used - # /Yu uses a precompiled header file during build - # /Fp specifies precompiled header binary file name - # /FI forces inclusion of file - if (_pchFile) - if (_flags) - # append to list - list (APPEND _flags "/Yu${_prefixFile}" "/Fp${_pchFile}" "/FI${_prefixFile}") - else() - # return as a flag string - set (_flags "/Yu\"${_prefixFile}\" /Fp\"${_pchFile}\" /FI\"${_prefixFile}\"") - endif() - else() - # no precompiled header, force inclusion of prefix header - if (_flags) - # append to list - list (APPEND _flags "/FI${_prefixFile}") - else() - # return as a flag string - set (_flags "/FI\"${_prefixFile}\"") - endif() - endif() - endif() - elseif (_compilerID MATCHES "Intel") - if (WIN32) - file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative) - # Windows Intel options used - # /Yu use a precompiled header (PCH) file - # /Fp specify a path or file name for precompiled header files - # /FI tells the preprocessor to include a specified file name as the header file - # /Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2) - if (_pchFile) - file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative) - if (_flags) - # append to list - list (APPEND _flags "/Yu" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}") - if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - list (APPEND _flags "/Wpch-messages") - endif() - else() - # return as a flag string - set (_flags "/Yu /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"") - if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - set (_flags "${_flags} /Wpch-messages") - endif() - endif() - else() - # no precompiled header, force inclusion of prefix header - if (_flags) - # append to list - list (APPEND _flags "/FI${_prefixFileNative}") - else() - # return as a flag string - set (_flags "/FI\"${_prefixFileNative}\"") - endif() - endif() - else() - # Linux / Mac OS X Intel options used - # -pch-dir location for precompiled header files - # -pch-use name of the precompiled header (PCH) to use - # -include process include file as the first line of the primary source file - # -Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2) - if (_pchFile) - get_filename_component(_pchDir "${_pchFile}" DIRECTORY) - get_filename_component(_pchName "${_pchFile}" NAME) - set (_pchSuppressMessages FALSE) - if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*") - set(_pchSuppressMessages TRUE) - endif() - if (_flags) - # append to list - list (APPEND _flags -include "${_prefixFile}" -pch-dir "${_pchDir}" -pch-use "${_pchName}") - if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - if (NOT _pchSuppressMessages) - list (APPEND _flags -Wpch-messages) - endif() - endif() - else() - # return as a flag string - set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-use \"${_pchName}\"") - if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0") - if (NOT _pchSuppressMessages) - set (_flags "${_flags} -Wpch-messages") - endif() - endif() - endif() - else() - # no precompiled header, force inclusion of prefix header - if (_flags) - # append to list - list (APPEND _flags -include "${_prefixFile}") - else() - # return as a flag string - set (_flags "-include \"${_prefixFile}\"") - endif() - endif() - endif() - else() - message (FATAL_ERROR "cotire: unsupported ${_language} compiler ${_compilerID} version ${_compilerVersion}.") - endif() - set (${_flagsVar} ${_flags} PARENT_SCOPE) -endfunction() - -function (cotire_precompile_prefix_header _prefixFile _pchFile _hostFile) - set(_options "") - set(_oneValueArgs COMPILER_EXECUTABLE COMPILER_ARG1 COMPILER_ID COMPILER_VERSION LANGUAGE) - set(_multiValueArgs COMPILE_DEFINITIONS COMPILE_FLAGS INCLUDE_DIRECTORIES SYSTEM_INCLUDE_DIRECTORIES SYS COMPILER_LAUNCHER) - cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) - if (NOT _option_LANGUAGE) - set (_option_LANGUAGE "CXX") - endif() - if (NOT _option_COMPILER_ID) - set (_option_COMPILER_ID "${CMAKE_${_option_LANGUAGE}_ID}") - endif() - if (NOT _option_COMPILER_VERSION) - set (_option_COMPILER_VERSION "${CMAKE_${_option_LANGUAGE}_COMPILER_VERSION}") - endif() - cotire_init_compile_cmd(_cmd "${_option_LANGUAGE}" "${_option_COMPILER_LAUNCHER}" "${_option_COMPILER_EXECUTABLE}" "${_option_COMPILER_ARG1}") - cotire_add_definitions_to_cmd(_cmd "${_option_LANGUAGE}" ${_option_COMPILE_DEFINITIONS}) - cotire_add_compile_flags_to_cmd(_cmd ${_option_COMPILE_FLAGS}) - cotire_add_includes_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES) - cotire_add_frameworks_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES) - cotire_add_pch_compilation_flags( - "${_option_LANGUAGE}" "${_option_COMPILER_ID}" "${_option_COMPILER_VERSION}" - "${_prefixFile}" "${_pchFile}" "${_hostFile}" _cmd) - if (COTIRE_VERBOSE) - message (STATUS "execute_process: ${_cmd}") - endif() - if (MSVC_IDE OR _option_COMPILER_ID MATCHES "MSVC") - # cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared - unset (ENV{VS_UNICODE_OUTPUT}) - elseif (_option_COMPILER_ID MATCHES "Clang" AND _option_COMPILER_VERSION VERSION_LESS "4.0.0") - if (_option_COMPILER_LAUNCHER MATCHES "ccache" OR - _option_COMPILER_EXECUTABLE MATCHES "ccache") - # Newer versions of Clang embed a compilation timestamp into the precompiled header binary, - # which results in "file has been modified since the precompiled header was built" errors if ccache is used. - # We work around the problem by disabling ccache upon pre-compiling the prefix header. - set (ENV{CCACHE_DISABLE} "true") - endif() - endif() - execute_process( - COMMAND ${_cmd} - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - RESULT_VARIABLE _result) - if (_result) - message (FATAL_ERROR "cotire: error ${_result} precompiling ${_prefixFile}.") - endif() -endfunction() - -function (cotire_check_precompiled_header_support _language _target _msgVar) - set (_unsupportedCompiler - "Precompiled headers not supported for ${_language} compiler ${CMAKE_${_language}_COMPILER_ID}") - if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC") - # PCH supported since Visual Studio C++ 6.0 - # and CMake does not support an earlier version - set (${_msgVar} "" PARENT_SCOPE) - elseif (CMAKE_${_language}_COMPILER_ID MATCHES "GNU") - # GCC PCH support requires version >= 3.4 - if ("${CMAKE_${_language}_COMPILER_VERSION}" VERSION_LESS "3.4.0") - set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}." PARENT_SCOPE) - else() - set (${_msgVar} "" PARENT_SCOPE) - endif() - elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Clang") - if (UNIX) - # all Unix Clang versions have PCH support - set (${_msgVar} "" PARENT_SCOPE) - elseif (WIN32) - # only clang-cl is supported under Windows - get_filename_component(_compilerName "${CMAKE_${_language}_COMPILER}" NAME_WE) - if (NOT _compilerName MATCHES "cl$") - set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}. Use clang-cl instead." PARENT_SCOPE) - endif() - endif() - elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Intel") - # Intel PCH support requires version >= 8.0.0 - if ("${CMAKE_${_language}_COMPILER_VERSION}" VERSION_LESS "8.0.0") - set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}." PARENT_SCOPE) - else() - set (${_msgVar} "" PARENT_SCOPE) - endif() - else() - set (${_msgVar} "${_unsupportedCompiler}." PARENT_SCOPE) - endif() - # check if ccache is used as a compiler launcher - get_target_property(_launcher ${_target} ${_language}_COMPILER_LAUNCHER) - get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" REALPATH) - if (_realCompilerExe MATCHES "ccache" OR _launcher MATCHES "ccache") - # verify that ccache configuration is compatible with precompiled headers - # always check environment variable CCACHE_SLOPPINESS, because earlier versions of ccache - # do not report the "sloppiness" setting correctly upon printing ccache configuration - if (DEFINED ENV{CCACHE_SLOPPINESS}) - if (NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "pch_defines" OR - NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "time_macros") - set (${_msgVar} - "ccache requires the environment variable CCACHE_SLOPPINESS to be set to \"pch_defines,time_macros\"." - PARENT_SCOPE) - endif() - else() - if (_realCompilerExe MATCHES "ccache") - set (_ccacheExe "${_realCompilerExe}") - else() - set (_ccacheExe "${_launcher}") - endif() - execute_process( - COMMAND "${_ccacheExe}" "--print-config" - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" - RESULT_VARIABLE _result - OUTPUT_VARIABLE _ccacheConfig OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_QUIET) - if (_result) - set (${_msgVar} "ccache configuration cannot be determined." PARENT_SCOPE) - elseif (NOT _ccacheConfig MATCHES "sloppiness.*=.*time_macros" OR - NOT _ccacheConfig MATCHES "sloppiness.*=.*pch_defines") - set (${_msgVar} - "ccache requires configuration setting \"sloppiness\" to be set to \"pch_defines,time_macros\"." - PARENT_SCOPE) - endif() - endif() - endif() - if (APPLE) - # PCH compilation not supported by GCC / Clang for multi-architecture builds (e.g., i386, x86_64) - cotire_get_configuration_types(_configs) - foreach (_config ${_configs}) - set (_targetFlags "") - cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags) - cotire_filter_compile_flags("${_language}" "arch" _architectures _ignore ${_targetFlags}) - list (LENGTH _architectures _numberOfArchitectures) - if (_numberOfArchitectures GREATER 1) - string (REPLACE ";" ", " _architectureStr "${_architectures}") - set (${_msgVar} - "Precompiled headers not supported on Darwin for multi-architecture builds (${_architectureStr})." - PARENT_SCOPE) - break() - endif() - endforeach() - endif() -endfunction() - -macro (cotire_get_intermediate_dir _cotireDir) - # ${CMAKE_CFG_INTDIR} may reference a build-time variable when using a generator which supports configuration types - get_filename_component(${_cotireDir} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${COTIRE_INTDIR}" ABSOLUTE) -endmacro() - -macro (cotire_setup_file_extension_variables) - set (_unityFileExt_C ".c") - set (_unityFileExt_CXX ".cxx") - set (_prefixFileExt_C ".h") - set (_prefixFileExt_CXX ".hxx") - set (_prefixSourceFileExt_C ".c") - set (_prefixSourceFileExt_CXX ".cxx") -endmacro() - -function (cotire_make_single_unity_source_file_path _language _target _unityFileVar) - cotire_setup_file_extension_variables() - if (NOT DEFINED _unityFileExt_${_language}) - set (${_unityFileVar} "" PARENT_SCOPE) - return() - endif() - set (_unityFileBaseName "${_target}_${_language}${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}") - set (_unityFileName "${_unityFileBaseName}${_unityFileExt_${_language}}") - cotire_get_intermediate_dir(_baseDir) - set (_unityFile "${_baseDir}/${_unityFileName}") - set (${_unityFileVar} "${_unityFile}" PARENT_SCOPE) -endfunction() - -function (cotire_make_unity_source_file_paths _language _target _maxIncludes _unityFilesVar) - cotire_setup_file_extension_variables() - if (NOT DEFINED _unityFileExt_${_language}) - set (${_unityFileVar} "" PARENT_SCOPE) - return() - endif() - set (_unityFileBaseName "${_target}_${_language}${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}") - cotire_get_intermediate_dir(_baseDir) - set (_startIndex 0) - set (_index 0) - set (_unityFiles "") - set (_sourceFiles ${ARGN}) - foreach (_sourceFile ${_sourceFiles}) - get_source_file_property(_startNew "${_sourceFile}" COTIRE_START_NEW_UNITY_SOURCE) - math (EXPR _unityFileCount "${_index} - ${_startIndex}") - if (_startNew OR (_maxIncludes GREATER 0 AND NOT _unityFileCount LESS _maxIncludes)) - if (_index GREATER 0) - # start new unity file segment - math (EXPR _endIndex "${_index} - 1") - set (_unityFileName "${_unityFileBaseName}_${_startIndex}_${_endIndex}${_unityFileExt_${_language}}") - list (APPEND _unityFiles "${_baseDir}/${_unityFileName}") - endif() - set (_startIndex ${_index}) - endif() - math (EXPR _index "${_index} + 1") - endforeach() - list (LENGTH _sourceFiles _numberOfSources) - if (_startIndex EQUAL 0) - # there is only a single unity file - cotire_make_single_unity_source_file_path(${_language} ${_target} _unityFiles) - elseif (_startIndex LESS _numberOfSources) - # end with final unity file segment - math (EXPR _endIndex "${_index} - 1") - set (_unityFileName "${_unityFileBaseName}_${_startIndex}_${_endIndex}${_unityFileExt_${_language}}") - list (APPEND _unityFiles "${_baseDir}/${_unityFileName}") - endif() - set (${_unityFilesVar} ${_unityFiles} PARENT_SCOPE) - if (COTIRE_DEBUG AND _unityFiles) - message (STATUS "unity files: ${_unityFiles}") - endif() -endfunction() - -function (cotire_unity_to_prefix_file_path _language _target _unityFile _prefixFileVar) - cotire_setup_file_extension_variables() - if (NOT DEFINED _unityFileExt_${_language}) - set (${_prefixFileVar} "" PARENT_SCOPE) - return() - endif() - set (_unityFileBaseName "${_target}_${_language}${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}") - set (_prefixFileBaseName "${_target}_${_language}${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}") - string (REPLACE "${_unityFileBaseName}" "${_prefixFileBaseName}" _prefixFile "${_unityFile}") - string (REGEX REPLACE "${_unityFileExt_${_language}}$" "${_prefixFileExt_${_language}}" _prefixFile "${_prefixFile}") - set (${_prefixFileVar} "${_prefixFile}" PARENT_SCOPE) -endfunction() - -function (cotire_prefix_header_to_source_file_path _language _prefixHeaderFile _prefixSourceFileVar) - cotire_setup_file_extension_variables() - if (NOT DEFINED _prefixSourceFileExt_${_language}) - set (${_prefixSourceFileVar} "" PARENT_SCOPE) - return() - endif() - string (REGEX REPLACE "${_prefixFileExt_${_language}}$" "${_prefixSourceFileExt_${_language}}" _prefixSourceFile "${_prefixHeaderFile}") - set (${_prefixSourceFileVar} "${_prefixSourceFile}" PARENT_SCOPE) -endfunction() - -function (cotire_make_prefix_file_name _language _target _prefixFileBaseNameVar _prefixFileNameVar) - cotire_setup_file_extension_variables() - if (NOT _language) - set (_prefixFileBaseName "${_target}${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}") - set (_prefixFileName "${_prefixFileBaseName}${_prefixFileExt_C}") - elseif (DEFINED _prefixFileExt_${_language}) - set (_prefixFileBaseName "${_target}_${_language}${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}") - set (_prefixFileName "${_prefixFileBaseName}${_prefixFileExt_${_language}}") - else() - set (_prefixFileBaseName "") - set (_prefixFileName "") - endif() - set (${_prefixFileBaseNameVar} "${_prefixFileBaseName}" PARENT_SCOPE) - set (${_prefixFileNameVar} "${_prefixFileName}" PARENT_SCOPE) -endfunction() - -function (cotire_make_prefix_file_path _language _target _prefixFileVar) - cotire_make_prefix_file_name("${_language}" "${_target}" _prefixFileBaseName _prefixFileName) - set (${_prefixFileVar} "" PARENT_SCOPE) - if (_prefixFileName) - if (NOT _language) - set (_language "C") - endif() - if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang|Intel|MSVC") - cotire_get_intermediate_dir(_baseDir) - set (${_prefixFileVar} "${_baseDir}/${_prefixFileName}" PARENT_SCOPE) - endif() - endif() -endfunction() - -function (cotire_make_pch_file_path _language _target _pchFileVar) - cotire_make_prefix_file_name("${_language}" "${_target}" _prefixFileBaseName _prefixFileName) - set (${_pchFileVar} "" PARENT_SCOPE) - if (_prefixFileBaseName AND _prefixFileName) - cotire_check_precompiled_header_support("${_language}" "${_target}" _msg) - if (NOT _msg) - if (XCODE) - # For Xcode, we completely hand off the compilation of the prefix header to the IDE - return() - endif() - cotire_get_intermediate_dir(_baseDir) - if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC") - # MSVC uses the extension .pch added to the prefix header base name - set (${_pchFileVar} "${_baseDir}/${_prefixFileBaseName}.pch" PARENT_SCOPE) - elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Clang") - # Clang looks for a precompiled header corresponding to the prefix header with the extension .pch appended - set (${_pchFileVar} "${_baseDir}/${_prefixFileName}.pch" PARENT_SCOPE) - elseif (CMAKE_${_language}_COMPILER_ID MATCHES "GNU") - # GCC looks for a precompiled header corresponding to the prefix header with the extension .gch appended - set (${_pchFileVar} "${_baseDir}/${_prefixFileName}.gch" PARENT_SCOPE) - elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Intel") - # Intel uses the extension .pchi added to the prefix header base name - set (${_pchFileVar} "${_baseDir}/${_prefixFileBaseName}.pchi" PARENT_SCOPE) - endif() - endif() - endif() -endfunction() - -function (cotire_select_unity_source_files _unityFile _sourcesVar) - set (_sourceFiles ${ARGN}) - if (_sourceFiles AND "${_unityFile}" MATCHES "${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}_([0-9]+)_([0-9]+)") - set (_startIndex ${CMAKE_MATCH_1}) - set (_endIndex ${CMAKE_MATCH_2}) - list (LENGTH _sourceFiles _numberOfSources) - if (NOT _startIndex LESS _numberOfSources) - math (EXPR _startIndex "${_numberOfSources} - 1") - endif() - if (NOT _endIndex LESS _numberOfSources) - math (EXPR _endIndex "${_numberOfSources} - 1") - endif() - set (_files "") - foreach (_index RANGE ${_startIndex} ${_endIndex}) - list (GET _sourceFiles ${_index} _file) - list (APPEND _files "${_file}") - endforeach() - else() - set (_files ${_sourceFiles}) - endif() - set (${_sourcesVar} ${_files} PARENT_SCOPE) -endfunction() - -function (cotire_get_unity_source_dependencies _language _target _dependencySourcesVar) - set (_dependencySources "") - # depend on target's generated source files - get_target_property(_targetSourceFiles ${_target} SOURCES) - cotire_get_objects_with_property_on(_generatedSources GENERATED SOURCE ${_targetSourceFiles}) - if (_generatedSources) - # but omit all generated source files that have the COTIRE_EXCLUDED property set to true - cotire_get_objects_with_property_on(_excludedGeneratedSources COTIRE_EXCLUDED SOURCE ${_generatedSources}) - if (_excludedGeneratedSources) - list (REMOVE_ITEM _generatedSources ${_excludedGeneratedSources}) - endif() - # and omit all generated source files that have the COTIRE_DEPENDENCY property set to false explicitly - cotire_get_objects_with_property_off(_excludedNonDependencySources COTIRE_DEPENDENCY SOURCE ${_generatedSources}) - if (_excludedNonDependencySources) - list (REMOVE_ITEM _generatedSources ${_excludedNonDependencySources}) - endif() - if (_generatedSources) - list (APPEND _dependencySources ${_generatedSources}) - endif() - endif() - if (COTIRE_DEBUG AND _dependencySources) - message (STATUS "${_language} ${_target} unity source dependencies: ${_dependencySources}") - endif() - set (${_dependencySourcesVar} ${_dependencySources} PARENT_SCOPE) -endfunction() - -function (cotire_get_prefix_header_dependencies _language _target _dependencySourcesVar) - set (_dependencySources "") - # depend on target source files marked with custom COTIRE_DEPENDENCY property - get_target_property(_targetSourceFiles ${_target} SOURCES) - cotire_get_objects_with_property_on(_dependencySources COTIRE_DEPENDENCY SOURCE ${_targetSourceFiles}) - if (COTIRE_DEBUG AND _dependencySources) - message (STATUS "${_language} ${_target} prefix header dependencies: ${_dependencySources}") - endif() - set (${_dependencySourcesVar} ${_dependencySources} PARENT_SCOPE) -endfunction() - -function (cotire_generate_target_script _language _configurations _target _targetScriptVar _targetConfigScriptVar) - set (_targetSources ${ARGN}) - cotire_get_prefix_header_dependencies(${_language} ${_target} COTIRE_TARGET_PREFIX_DEPENDS ${_targetSources}) - cotire_get_unity_source_dependencies(${_language} ${_target} COTIRE_TARGET_UNITY_DEPENDS ${_targetSources}) - # set up variables to be configured - set (COTIRE_TARGET_LANGUAGE "${_language}") - get_target_property(COTIRE_TARGET_IGNORE_PATH ${_target} COTIRE_PREFIX_HEADER_IGNORE_PATH) - cotire_add_sys_root_paths(COTIRE_TARGET_IGNORE_PATH) - get_target_property(COTIRE_TARGET_INCLUDE_PATH ${_target} COTIRE_PREFIX_HEADER_INCLUDE_PATH) - cotire_add_sys_root_paths(COTIRE_TARGET_INCLUDE_PATH) - get_target_property(COTIRE_TARGET_PRE_UNDEFS ${_target} COTIRE_UNITY_SOURCE_PRE_UNDEFS) - get_target_property(COTIRE_TARGET_POST_UNDEFS ${_target} COTIRE_UNITY_SOURCE_POST_UNDEFS) - get_target_property(COTIRE_TARGET_MAXIMUM_NUMBER_OF_INCLUDES ${_target} COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES) - get_target_property(COTIRE_TARGET_INCLUDE_PRIORITY_PATH ${_target} COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH) - cotire_get_source_files_undefs(COTIRE_UNITY_SOURCE_PRE_UNDEFS COTIRE_TARGET_SOURCES_PRE_UNDEFS ${_targetSources}) - cotire_get_source_files_undefs(COTIRE_UNITY_SOURCE_POST_UNDEFS COTIRE_TARGET_SOURCES_POST_UNDEFS ${_targetSources}) - set (COTIRE_TARGET_CONFIGURATION_TYPES "${_configurations}") - foreach (_config ${_configurations}) - string (TOUPPER "${_config}" _upperConfig) - cotire_get_target_include_directories( - "${_config}" "${_language}" "${_target}" COTIRE_TARGET_INCLUDE_DIRECTORIES_${_upperConfig} COTIRE_TARGET_SYSTEM_INCLUDE_DIRECTORIES_${_upperConfig}) - cotire_get_target_compile_definitions( - "${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_DEFINITIONS_${_upperConfig}) - cotire_get_target_compiler_flags( - "${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}) - cotire_get_source_files_compile_definitions( - "${_config}" "${_language}" COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig} ${_targetSources}) - endforeach() - get_target_property(COTIRE_TARGET_${_language}_COMPILER_LAUNCHER ${_target} ${_language}_COMPILER_LAUNCHER) - # set up COTIRE_TARGET_SOURCES - set (COTIRE_TARGET_SOURCES "") - foreach (_sourceFile ${_targetSources}) - get_source_file_property(_generated "${_sourceFile}" GENERATED) - if (_generated) - # use absolute paths for generated files only, retrieving the LOCATION property is an expensive operation - get_source_file_property(_sourceLocation "${_sourceFile}" LOCATION) - list (APPEND COTIRE_TARGET_SOURCES "${_sourceLocation}") - else() - list (APPEND COTIRE_TARGET_SOURCES "${_sourceFile}") - endif() - endforeach() - # copy variable definitions to cotire target script - get_cmake_property(_vars VARIABLES) - string (REGEX MATCHALL "COTIRE_[A-Za-z0-9_]+" _matchVars "${_vars}") - # omit COTIRE_*_INIT variables - string (REGEX MATCHALL "COTIRE_[A-Za-z0-9_]+_INIT" _initVars "${_matchVars}") - if (_initVars) - list (REMOVE_ITEM _matchVars ${_initVars}) - endif() - # omit COTIRE_VERBOSE which is passed as a CMake define on command line - list (REMOVE_ITEM _matchVars COTIRE_VERBOSE) - set (_contents "") - set (_contentsHasGeneratorExpressions FALSE) - foreach (_var IN LISTS _matchVars ITEMS - XCODE MSVC CMAKE_GENERATOR CMAKE_BUILD_TYPE CMAKE_CONFIGURATION_TYPES - CMAKE_${_language}_COMPILER_ID CMAKE_${_language}_COMPILER_VERSION - CMAKE_${_language}_COMPILER_LAUNCHER CMAKE_${_language}_COMPILER CMAKE_${_language}_COMPILER_ARG1 - CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_SEP_${_language} - CMAKE_INCLUDE_SYSTEM_FLAG_${_language} - CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG - CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG - CMAKE_${_language}_SOURCE_FILE_EXTENSIONS) - if (DEFINED ${_var}) - string (REPLACE "\"" "\\\"" _value "${${_var}}") - set (_contents "${_contents}set (${_var} \"${_value}\")\n") - if (NOT _contentsHasGeneratorExpressions) - if ("${_value}" MATCHES "\\$<.*>") - set (_contentsHasGeneratorExpressions TRUE) - endif() - endif() - endif() - endforeach() - # generate target script file - get_filename_component(_moduleName "${COTIRE_CMAKE_MODULE_FILE}" NAME) - set (_targetCotireScript "${CMAKE_CURRENT_BINARY_DIR}/${_target}_${_language}_${_moduleName}") - cotire_write_file("CMAKE" "${_targetCotireScript}" "${_contents}" FALSE) - if (_contentsHasGeneratorExpressions) - # use file(GENERATE ...) to expand generator expressions in the target script at CMake generate-time - set (_configNameOrNoneGeneratorExpression "$<$:None>$<$>:$>") - set (_targetCotireConfigScript "${CMAKE_CURRENT_BINARY_DIR}/${_target}_${_language}_${_configNameOrNoneGeneratorExpression}_${_moduleName}") - file (GENERATE OUTPUT "${_targetCotireConfigScript}" INPUT "${_targetCotireScript}") - else() - set (_targetCotireConfigScript "${_targetCotireScript}") - endif() - set (${_targetScriptVar} "${_targetCotireScript}" PARENT_SCOPE) - set (${_targetConfigScriptVar} "${_targetCotireConfigScript}" PARENT_SCOPE) -endfunction() - -function (cotire_setup_pch_file_compilation _language _target _targetScript _prefixFile _pchFile _hostFile) - set (_sourceFiles ${ARGN}) - if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" OR - (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang")) - # for MSVC, Intel and Clang-cl, we attach the precompiled header compilation to the host file - # the remaining files include the precompiled header, see cotire_setup_pch_file_inclusion - if (_sourceFiles) - set (_flags "") - cotire_add_pch_compilation_flags( - "${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}" - "${_prefixFile}" "${_pchFile}" "${_hostFile}" _flags) - set_property (SOURCE ${_hostFile} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ") - set_property (SOURCE ${_hostFile} APPEND PROPERTY OBJECT_OUTPUTS "${_pchFile}") - # make object file generated from host file depend on prefix header - set_property (SOURCE ${_hostFile} APPEND PROPERTY OBJECT_DEPENDS "${_prefixFile}") - # mark host file as cotired to prevent it from being used in another cotired target - set_property (SOURCE ${_hostFile} PROPERTY COTIRE_TARGET "${_target}") - endif() - elseif ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja") - # for makefile based generator, we add a custom command to precompile the prefix header - if (_targetScript) - cotire_set_cmd_to_prologue(_cmds) - list (APPEND _cmds -P "${COTIRE_CMAKE_MODULE_FILE}" "precompile" "${_targetScript}" "${_prefixFile}" "${_pchFile}" "${_hostFile}") - if (MSVC_IDE) - file (TO_NATIVE_PATH "${_pchFile}" _pchFileLogPath) - else() - file (RELATIVE_PATH _pchFileLogPath "${CMAKE_BINARY_DIR}" "${_pchFile}") - endif() - # make precompiled header compilation depend on the actual compiler executable used to force - # re-compilation when the compiler executable is updated. This prevents "created by a different GCC executable" - # warnings when the precompiled header is included. - get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" ABSOLUTE) - if (COTIRE_DEBUG) - message (STATUS "add_custom_command: OUTPUT ${_pchFile} ${_cmds} DEPENDS ${_prefixFile} ${_realCompilerExe} IMPLICIT_DEPENDS ${_language} ${_prefixFile}") - endif() - set_property (SOURCE "${_pchFile}" PROPERTY GENERATED TRUE) - add_custom_command( - OUTPUT "${_pchFile}" - COMMAND ${_cmds} - DEPENDS "${_prefixFile}" "${_realCompilerExe}" - IMPLICIT_DEPENDS ${_language} "${_prefixFile}" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - COMMENT "Building ${_language} precompiled header ${_pchFileLogPath}" - VERBATIM) - endif() - endif() -endfunction() - -function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefixFile _pchFile _hostFile) - if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" OR - (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang")) - # for MSVC, Intel and clang-cl, we include the precompiled header in all but the host file - # the host file does the precompiled header compilation, see cotire_setup_pch_file_compilation - set (_sourceFiles ${ARGN}) - list (LENGTH _sourceFiles _numberOfSourceFiles) - if (_numberOfSourceFiles GREATER 0) - # mark sources as cotired to prevent them from being used in another cotired target - set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}") - set (_flags "") - cotire_add_prefix_pch_inclusion_flags( - "${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}" - "${_prefixFile}" "${_pchFile}" _flags) - set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ") - # make object files generated from source files depend on precompiled header - set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_pchFile}") - endif() - elseif ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja") - set (_sourceFiles ${_hostFile} ${ARGN}) - if (NOT _wholeTarget) - # for makefile based generator, we force the inclusion of the prefix header for a subset - # of the source files, if this is a multi-language target or has excluded files - set (_flags "") - cotire_add_prefix_pch_inclusion_flags( - "${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}" - "${_prefixFile}" "${_pchFile}" _flags) - set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ") - # mark sources as cotired to prevent them from being used in another cotired target - set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}") - endif() - # make object files generated from source files depend on precompiled header - set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_pchFile}") - endif() -endfunction() - -function (cotire_setup_prefix_file_inclusion _language _target _prefixFile) - set (_sourceFiles ${ARGN}) - # force the inclusion of the prefix header for the given source files - set (_flags "") - set (_pchFile "") - cotire_add_prefix_pch_inclusion_flags( - "${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}" - "${_prefixFile}" "${_pchFile}" _flags) - set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ") - # mark sources as cotired to prevent them from being used in another cotired target - set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}") - # make object files generated from source files depend on prefix header - set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_prefixFile}") -endfunction() - -function (cotire_get_first_set_property_value _propertyValueVar _type _object) - set (_properties ${ARGN}) - foreach (_property ${_properties}) - get_property(_propertyValue ${_type} "${_object}" PROPERTY ${_property}) - if (_propertyValue) - set (${_propertyValueVar} ${_propertyValue} PARENT_SCOPE) - return() - endif() - endforeach() - set (${_propertyValueVar} "" PARENT_SCOPE) -endfunction() - -function (cotire_setup_combine_command _language _targetScript _joinedFile _cmdsVar) - set (_files ${ARGN}) - set (_filesPaths "") - foreach (_file ${_files}) - get_filename_component(_filePath "${_file}" ABSOLUTE) - list (APPEND _filesPaths "${_filePath}") - endforeach() - cotire_set_cmd_to_prologue(_prefixCmd) - list (APPEND _prefixCmd -P "${COTIRE_CMAKE_MODULE_FILE}" "combine") - if (_targetScript) - list (APPEND _prefixCmd "${_targetScript}") - endif() - list (APPEND _prefixCmd "${_joinedFile}" ${_filesPaths}) - if (COTIRE_DEBUG) - message (STATUS "add_custom_command: OUTPUT ${_joinedFile} COMMAND ${_prefixCmd} DEPENDS ${_files}") - endif() - set_property (SOURCE "${_joinedFile}" PROPERTY GENERATED TRUE) - if (MSVC_IDE) - file (TO_NATIVE_PATH "${_joinedFile}" _joinedFileLogPath) - else() - file (RELATIVE_PATH _joinedFileLogPath "${CMAKE_BINARY_DIR}" "${_joinedFile}") - endif() - get_filename_component(_joinedFileBaseName "${_joinedFile}" NAME_WE) - get_filename_component(_joinedFileExt "${_joinedFile}" EXT) - if (_language AND _joinedFileBaseName MATCHES "${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}$") - set (_comment "Generating ${_language} unity source ${_joinedFileLogPath}") - elseif (_language AND _joinedFileBaseName MATCHES "${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}$") - if (_joinedFileExt MATCHES "^\\.c") - set (_comment "Generating ${_language} prefix source ${_joinedFileLogPath}") - else() - set (_comment "Generating ${_language} prefix header ${_joinedFileLogPath}") - endif() - else() - set (_comment "Generating ${_joinedFileLogPath}") - endif() - add_custom_command( - OUTPUT "${_joinedFile}" - COMMAND ${_prefixCmd} - DEPENDS ${_files} - COMMENT "${_comment}" - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - VERBATIM) - list (APPEND ${_cmdsVar} COMMAND ${_prefixCmd}) - set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE) -endfunction() - -function (cotire_setup_target_pch_usage _languages _target _wholeTarget) - if (XCODE) - # for Xcode, we attach a pre-build action to generate the unity sources and prefix headers - set (_prefixFiles "") - foreach (_language ${_languages}) - get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER) - if (_prefixFile) - list (APPEND _prefixFiles "${_prefixFile}") - endif() - endforeach() - set (_cmds ${ARGN}) - list (LENGTH _prefixFiles _numberOfPrefixFiles) - if (_numberOfPrefixFiles GREATER 1) - # we also generate a generic, single prefix header which includes all language specific prefix headers - set (_language "") - set (_targetScript "") - cotire_make_prefix_file_path("${_language}" ${_target} _prefixHeader) - cotire_setup_combine_command("${_language}" "${_targetScript}" "${_prefixHeader}" _cmds ${_prefixFiles}) - else() - set (_prefixHeader "${_prefixFiles}") - endif() - if (COTIRE_DEBUG) - message (STATUS "add_custom_command: TARGET ${_target} PRE_BUILD ${_cmds}") - endif() - # because CMake PRE_BUILD command does not support dependencies, - # we check dependencies explicity in cotire script mode when the pre-build action is run - add_custom_command( - TARGET "${_target}" - PRE_BUILD ${_cmds} - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - COMMENT "Updating target ${_target} prefix headers" - VERBATIM) - # make Xcode precompile the generated prefix header with ProcessPCH and ProcessPCH++ - set_target_properties(${_target} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES") - set_target_properties(${_target} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${_prefixHeader}") - elseif ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja") - # for makefile based generator, we force inclusion of the prefix header for all target source files - # if this is a single-language target without any excluded files - if (_wholeTarget) - set (_language "${_languages}") - # for MSVC, Intel and clang-cl, precompiled header inclusion is always done on the source file level - # see cotire_setup_pch_file_inclusion - if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" AND NOT - (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang")) - get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER) - if (_prefixFile) - get_property(_pchFile TARGET ${_target} PROPERTY COTIRE_${_language}_PRECOMPILED_HEADER) - set (_options COMPILE_OPTIONS) - cotire_add_prefix_pch_inclusion_flags( - "${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}" - "${_prefixFile}" "${_pchFile}" _options) - set_property(TARGET ${_target} APPEND PROPERTY ${_options}) - endif() - endif() - endif() - endif() -endfunction() - -function (cotire_setup_unity_generation_commands _language _target _targetScript _targetConfigScript _unityFiles _cmdsVar) - set (_dependencySources "") - cotire_get_unity_source_dependencies(${_language} ${_target} _dependencySources ${ARGN}) - foreach (_unityFile ${_unityFiles}) - set_property (SOURCE "${_unityFile}" PROPERTY GENERATED TRUE) - # set up compiled unity source dependencies via OBJECT_DEPENDS - # this ensures that missing source files are generated before the unity file is compiled - if (COTIRE_DEBUG AND _dependencySources) - message (STATUS "${_unityFile} OBJECT_DEPENDS ${_dependencySources}") - endif() - if (_dependencySources) - # the OBJECT_DEPENDS property requires a list of full paths - set (_objectDependsPaths "") - foreach (_sourceFile ${_dependencySources}) - get_source_file_property(_sourceLocation "${_sourceFile}" LOCATION) - list (APPEND _objectDependsPaths "${_sourceLocation}") - endforeach() - set_property (SOURCE "${_unityFile}" PROPERTY OBJECT_DEPENDS ${_objectDependsPaths}) - endif() - if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel") - # unity file compilation results in potentially huge object file, - # thus use /bigobj by default unter cl.exe and Windows Intel - set_property (SOURCE "${_unityFile}" APPEND_STRING PROPERTY COMPILE_FLAGS "/bigobj") - endif() - cotire_set_cmd_to_prologue(_unityCmd) - list (APPEND _unityCmd -P "${COTIRE_CMAKE_MODULE_FILE}" "unity" "${_targetConfigScript}" "${_unityFile}") - if (CMAKE_VERSION VERSION_LESS "3.1.0") - set (_unityCmdDepends "${_targetScript}") - else() - # CMake 3.1.0 supports generator expressions in arguments to DEPENDS - set (_unityCmdDepends "${_targetConfigScript}") - endif() - if (MSVC_IDE) - file (TO_NATIVE_PATH "${_unityFile}" _unityFileLogPath) - else() - file (RELATIVE_PATH _unityFileLogPath "${CMAKE_BINARY_DIR}" "${_unityFile}") - endif() - if (COTIRE_DEBUG) - message (STATUS "add_custom_command: OUTPUT ${_unityFile} COMMAND ${_unityCmd} DEPENDS ${_unityCmdDepends}") - endif() - add_custom_command( - OUTPUT "${_unityFile}" - COMMAND ${_unityCmd} - DEPENDS ${_unityCmdDepends} - COMMENT "Generating ${_language} unity source ${_unityFileLogPath}" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - VERBATIM) - list (APPEND ${_cmdsVar} COMMAND ${_unityCmd}) - endforeach() - set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE) -endfunction() - -function (cotire_setup_prefix_generation_command _language _target _targetScript _prefixFile _unityFiles _cmdsVar) - set (_sourceFiles ${ARGN}) - set (_dependencySources "") - cotire_get_prefix_header_dependencies(${_language} ${_target} _dependencySources ${_sourceFiles}) - cotire_set_cmd_to_prologue(_prefixCmd) - list (APPEND _prefixCmd -P "${COTIRE_CMAKE_MODULE_FILE}" "prefix" "${_targetScript}" "${_prefixFile}" ${_unityFiles}) - set_property (SOURCE "${_prefixFile}" PROPERTY GENERATED TRUE) - # make prefix header generation depend on the actual compiler executable used to force - # re-generation when the compiler executable is updated. This prevents "file not found" - # errors for compiler version specific system header files. - get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" ABSOLUTE) - if (COTIRE_DEBUG) - message (STATUS "add_custom_command: OUTPUT ${_prefixFile} COMMAND ${_prefixCmd} DEPENDS ${_unityFile} ${_dependencySources} ${_realCompilerExe}") - endif() - if (MSVC_IDE) - file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileLogPath) - else() - file (RELATIVE_PATH _prefixFileLogPath "${CMAKE_BINARY_DIR}" "${_prefixFile}") - endif() - get_filename_component(_prefixFileExt "${_prefixFile}" EXT) - if (_prefixFileExt MATCHES "^\\.c") - set (_comment "Generating ${_language} prefix source ${_prefixFileLogPath}") - else() - set (_comment "Generating ${_language} prefix header ${_prefixFileLogPath}") - endif() - # prevent pre-processing errors upon generating the prefix header when a target's generated include file does not yet exist - # we do not add a file-level dependency for the target's generated files though, because we only want to depend on their existence - # thus we make the prefix header generation depend on a custom helper target which triggers the generation of the files - set (_preTargetName "${_target}${COTIRE_PCH_TARGET_SUFFIX}_pre") - if (TARGET ${_preTargetName}) - # custom helper target has already been generated while processing a different language - list (APPEND _dependencySources ${_preTargetName}) - else() - get_target_property(_targetSourceFiles ${_target} SOURCES) - cotire_get_objects_with_property_on(_generatedSources GENERATED SOURCE ${_targetSourceFiles}) - if (_generatedSources) - add_custom_target("${_preTargetName}" DEPENDS ${_generatedSources}) - cotire_init_target("${_preTargetName}") - list (APPEND _dependencySources ${_preTargetName}) - endif() - endif() - add_custom_command( - OUTPUT "${_prefixFile}" "${_prefixFile}.log" - COMMAND ${_prefixCmd} - DEPENDS ${_unityFiles} ${_dependencySources} "${_realCompilerExe}" - COMMENT "${_comment}" - WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" - VERBATIM) - list (APPEND ${_cmdsVar} COMMAND ${_prefixCmd}) - set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE) -endfunction() - -function (cotire_setup_prefix_generation_from_unity_command _language _target _targetScript _prefixFile _unityFiles _cmdsVar) - set (_sourceFiles ${ARGN}) - if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang") - # GNU and Clang require indirect compilation of the prefix header to make them honor the system_header pragma - cotire_prefix_header_to_source_file_path(${_language} "${_prefixFile}" _prefixSourceFile) - else() - set (_prefixSourceFile "${_prefixFile}") - endif() - cotire_setup_prefix_generation_command( - ${_language} ${_target} "${_targetScript}" - "${_prefixSourceFile}" "${_unityFiles}" ${_cmdsVar} ${_sourceFiles}) - if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang") - # set up generation of a prefix source file which includes the prefix header - cotire_setup_combine_command(${_language} "${_targetScript}" "${_prefixFile}" _cmds ${_prefixSourceFile}) - endif() - set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE) -endfunction() - -function (cotire_setup_prefix_generation_from_provided_command _language _target _targetScript _prefixFile _cmdsVar) - set (_prefixHeaderFiles ${ARGN}) - if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang") - # GNU and Clang require indirect compilation of the prefix header to make them honor the system_header pragma - cotire_prefix_header_to_source_file_path(${_language} "${_prefixFile}" _prefixSourceFile) - else() - set (_prefixSourceFile "${_prefixFile}") - endif() - cotire_setup_combine_command(${_language} "${_targetScript}" "${_prefixSourceFile}" _cmds ${_prefixHeaderFiles}) - if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang") - # set up generation of a prefix source file which includes the prefix header - cotire_setup_combine_command(${_language} "${_targetScript}" "${_prefixFile}" _cmds ${_prefixSourceFile}) - endif() - set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE) -endfunction() - -function (cotire_init_cotire_target_properties _target) - get_property(_isSet TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER SET) - if (NOT _isSet) - set_property(TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER TRUE) - endif() - get_property(_isSet TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD SET) - if (NOT _isSet) - set_property(TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD TRUE) - endif() - get_property(_isSet TARGET ${_target} PROPERTY COTIRE_ADD_CLEAN SET) - if (NOT _isSet) - set_property(TARGET ${_target} PROPERTY COTIRE_ADD_CLEAN FALSE) - endif() - get_property(_isSet TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH SET) - if (NOT _isSet) - set_property(TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH "${CMAKE_SOURCE_DIR}") - cotire_check_is_path_relative_to("${CMAKE_BINARY_DIR}" _isRelative "${CMAKE_SOURCE_DIR}") - if (NOT _isRelative) - set_property(TARGET ${_target} APPEND PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH "${CMAKE_BINARY_DIR}") - endif() - endif() - get_property(_isSet TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PATH SET) - if (NOT _isSet) - set_property(TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PATH "") - endif() - get_property(_isSet TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH SET) - if (NOT _isSet) - set_property(TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH "") - endif() - get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_PRE_UNDEFS SET) - if (NOT _isSet) - set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_PRE_UNDEFS "") - endif() - get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_POST_UNDEFS SET) - if (NOT _isSet) - set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_POST_UNDEFS "") - endif() - get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT SET) - if (NOT _isSet) - set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY") - endif() - get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES SET) - if (NOT _isSet) - if (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES) - set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES "${COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES}") - else() - set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES "") - endif() - endif() -endfunction() - -function (cotire_make_target_message _target _languages _disableMsg _targetMsgVar) - get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER) - get_target_property(_targetAddSCU ${_target} COTIRE_ADD_UNITY_BUILD) - string (REPLACE ";" " " _languagesStr "${_languages}") - math (EXPR _numberOfExcludedFiles "${ARGC} - 4") - if (_numberOfExcludedFiles EQUAL 0) - set (_excludedStr "") - elseif (COTIRE_VERBOSE OR _numberOfExcludedFiles LESS 4) - string (REPLACE ";" ", " _excludedStr "excluding ${ARGN}") - else() - set (_excludedStr "excluding ${_numberOfExcludedFiles} files") - endif() - set (_targetMsg "") - if (NOT _languages) - set (_targetMsg "Target ${_target} cannot be cotired.") - if (_disableMsg) - set (_targetMsg "${_targetMsg} ${_disableMsg}") - endif() - elseif (NOT _targetUsePCH AND NOT _targetAddSCU) - set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build and precompiled header.") - if (_disableMsg) - set (_targetMsg "${_targetMsg} ${_disableMsg}") - endif() - elseif (NOT _targetUsePCH) - if (_excludedStr) - set (_targetMsg "${_languagesStr} target ${_target} cotired without precompiled header ${_excludedStr}.") - else() - set (_targetMsg "${_languagesStr} target ${_target} cotired without precompiled header.") - endif() - if (_disableMsg) - set (_targetMsg "${_targetMsg} ${_disableMsg}") - endif() - elseif (NOT _targetAddSCU) - if (_excludedStr) - set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build ${_excludedStr}.") - else() - set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build.") - endif() - if (_disableMsg) - set (_targetMsg "${_targetMsg} ${_disableMsg}") - endif() - else() - if (_excludedStr) - set (_targetMsg "${_languagesStr} target ${_target} cotired ${_excludedStr}.") - else() - set (_targetMsg "${_languagesStr} target ${_target} cotired.") - endif() - endif() - set (${_targetMsgVar} "${_targetMsg}" PARENT_SCOPE) -endfunction() - -function (cotire_choose_target_languages _target _targetLanguagesVar _wholeTargetVar) - set (_languages ${ARGN}) - set (_allSourceFiles "") - set (_allExcludedSourceFiles "") - set (_allCotiredSourceFiles "") - set (_targetLanguages "") - set (_pchEligibleTargetLanguages "") - get_target_property(_targetType ${_target} TYPE) - get_target_property(_targetSourceFiles ${_target} SOURCES) - get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER) - get_target_property(_targetAddSCU ${_target} COTIRE_ADD_UNITY_BUILD) - set (_disableMsg "") - foreach (_language ${_languages}) - get_target_property(_prefixHeader ${_target} COTIRE_${_language}_PREFIX_HEADER) - get_target_property(_unityBuildFile ${_target} COTIRE_${_language}_UNITY_SOURCE) - if (_prefixHeader OR _unityBuildFile) - message (STATUS "cotire: target ${_target} has already been cotired.") - set (${_targetLanguagesVar} "" PARENT_SCOPE) - return() - endif() - if (_targetUsePCH AND "${_language}" MATCHES "^C|CXX$" AND DEFINED CMAKE_${_language}_COMPILER_ID) - if (CMAKE_${_language}_COMPILER_ID) - cotire_check_precompiled_header_support("${_language}" "${_target}" _disableMsg) - if (_disableMsg) - set (_targetUsePCH FALSE) - endif() - endif() - endif() - set (_sourceFiles "") - set (_excludedSources "") - set (_cotiredSources "") - cotire_filter_language_source_files(${_language} ${_target} _sourceFiles _excludedSources _cotiredSources ${_targetSourceFiles}) - if (_sourceFiles OR _excludedSources OR _cotiredSources) - list (APPEND _targetLanguages ${_language}) - endif() - if (_sourceFiles) - list (APPEND _allSourceFiles ${_sourceFiles}) - endif() - list (LENGTH _sourceFiles _numberOfSources) - if (NOT _numberOfSources LESS ${COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES}) - list (APPEND _pchEligibleTargetLanguages ${_language}) - endif() - if (_excludedSources) - list (APPEND _allExcludedSourceFiles ${_excludedSources}) - endif() - if (_cotiredSources) - list (APPEND _allCotiredSourceFiles ${_cotiredSources}) - endif() - endforeach() - set (_targetMsgLevel STATUS) - if (NOT _targetLanguages) - string (REPLACE ";" " or " _languagesStr "${_languages}") - set (_disableMsg "No ${_languagesStr} source files.") - set (_targetUsePCH FALSE) - set (_targetAddSCU FALSE) - endif() - if (_targetUsePCH) - if (_allCotiredSourceFiles) - cotire_get_source_file_property_values(_cotireTargets COTIRE_TARGET ${_allCotiredSourceFiles}) - list (REMOVE_DUPLICATES _cotireTargets) - string (REPLACE ";" ", " _cotireTargetsStr "${_cotireTargets}") - set (_disableMsg "Target sources already include a precompiled header for target(s) ${_cotireTargets}.") - set (_disableMsg "${_disableMsg} Set target property COTIRE_ENABLE_PRECOMPILED_HEADER to FALSE for targets ${_target},") - set (_disableMsg "${_disableMsg} ${_cotireTargetsStr} to get a workable build system.") - set (_targetMsgLevel SEND_ERROR) - set (_targetUsePCH FALSE) - elseif (NOT _pchEligibleTargetLanguages) - set (_disableMsg "Too few applicable sources.") - set (_targetUsePCH FALSE) - elseif (XCODE AND _allExcludedSourceFiles) - # for Xcode, we cannot apply the precompiled header to individual sources, only to the whole target - set (_disableMsg "Exclusion of source files not supported for generator Xcode.") - set (_targetUsePCH FALSE) - elseif (XCODE AND "${_targetType}" STREQUAL "OBJECT_LIBRARY") - # for Xcode, we cannot apply the required PRE_BUILD action to generate the prefix header to an OBJECT_LIBRARY target - set (_disableMsg "Required PRE_BUILD action not supported for OBJECT_LIBRARY targets for generator Xcode.") - set (_targetUsePCH FALSE) - endif() - endif() - if (_targetAddSCU) - # disable unity builds if automatic Qt processing is used - get_target_property(_targetAutoMoc ${_target} AUTOMOC) - get_target_property(_targetAutoUic ${_target} AUTOUIC) - get_target_property(_targetAutoRcc ${_target} AUTORCC) - if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc) - if (_disableMsg) - set (_disableMsg "${_disableMsg} Target uses automatic CMake Qt processing.") - else() - set (_disableMsg "Target uses automatic CMake Qt processing.") - endif() - set (_targetAddSCU FALSE) - endif() - endif() - set_property(TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER ${_targetUsePCH}) - set_property(TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD ${_targetAddSCU}) - cotire_make_target_message(${_target} "${_targetLanguages}" "${_disableMsg}" _targetMsg ${_allExcludedSourceFiles}) - if (_targetMsg) - if (NOT DEFINED COTIREMSG_${_target}) - set (COTIREMSG_${_target} "") - endif() - if (COTIRE_VERBOSE OR NOT "${_targetMsgLevel}" STREQUAL "STATUS" OR - NOT "${COTIREMSG_${_target}}" STREQUAL "${_targetMsg}") - # cache message to avoid redundant messages on re-configure - set (COTIREMSG_${_target} "${_targetMsg}" CACHE INTERNAL "${_target} cotire message.") - message (${_targetMsgLevel} "${_targetMsg}") - endif() - endif() - list (LENGTH _targetLanguages _numberOfLanguages) - if (_numberOfLanguages GREATER 1 OR _allExcludedSourceFiles) - set (${_wholeTargetVar} FALSE PARENT_SCOPE) - else() - set (${_wholeTargetVar} TRUE PARENT_SCOPE) - endif() - set (${_targetLanguagesVar} ${_targetLanguages} PARENT_SCOPE) -endfunction() - -function (cotire_compute_unity_max_number_of_includes _target _maxIncludesVar) - set (_sourceFiles ${ARGN}) - get_target_property(_maxIncludes ${_target} COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES) - if (_maxIncludes MATCHES "(-j|--parallel|--jobs) ?([0-9]*)") - if (DEFINED CMAKE_MATCH_2) - set (_numberOfThreads "${CMAKE_MATCH_2}") - else() - set (_numberOfThreads "") - endif() - if (NOT _numberOfThreads) - # use all available cores - ProcessorCount(_numberOfThreads) - endif() - list (LENGTH _sourceFiles _numberOfSources) - math (EXPR _maxIncludes "(${_numberOfSources} + ${_numberOfThreads} - 1) / ${_numberOfThreads}") - elseif (NOT _maxIncludes MATCHES "[0-9]+") - set (_maxIncludes 0) - endif() - if (COTIRE_DEBUG) - message (STATUS "${_target} unity source max includes: ${_maxIncludes}") - endif() - set (${_maxIncludesVar} ${_maxIncludes} PARENT_SCOPE) -endfunction() - -function (cotire_process_target_language _language _configurations _target _wholeTarget _cmdsVar) - set (${_cmdsVar} "" PARENT_SCOPE) - get_target_property(_targetSourceFiles ${_target} SOURCES) - set (_sourceFiles "") - set (_excludedSources "") - set (_cotiredSources "") - cotire_filter_language_source_files(${_language} ${_target} _sourceFiles _excludedSources _cotiredSources ${_targetSourceFiles}) - if (NOT _sourceFiles AND NOT _cotiredSources) - return() - endif() - set (_cmds "") - # check for user provided unity source file list - get_property(_unitySourceFiles TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE_INIT) - if (NOT _unitySourceFiles) - set (_unitySourceFiles ${_sourceFiles} ${_cotiredSources}) - endif() - cotire_generate_target_script( - ${_language} "${_configurations}" ${_target} _targetScript _targetConfigScript ${_unitySourceFiles}) - # set up unity files for parallel compilation - cotire_compute_unity_max_number_of_includes(${_target} _maxIncludes ${_unitySourceFiles}) - cotire_make_unity_source_file_paths(${_language} ${_target} ${_maxIncludes} _unityFiles ${_unitySourceFiles}) - list (LENGTH _unityFiles _numberOfUnityFiles) - if (_numberOfUnityFiles EQUAL 0) - return() - elseif (_numberOfUnityFiles GREATER 1) - cotire_setup_unity_generation_commands( - ${_language} ${_target} "${_targetScript}" "${_targetConfigScript}" "${_unityFiles}" _cmds ${_unitySourceFiles}) - endif() - # set up single unity file for prefix header generation - cotire_make_single_unity_source_file_path(${_language} ${_target} _unityFile) - cotire_setup_unity_generation_commands( - ${_language} ${_target} "${_targetScript}" "${_targetConfigScript}" "${_unityFile}" _cmds ${_unitySourceFiles}) - cotire_make_prefix_file_path(${_language} ${_target} _prefixFile) - # set up prefix header - if (_prefixFile) - # check for user provided prefix header files - get_property(_prefixHeaderFiles TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER_INIT) - if (_prefixHeaderFiles) - cotire_setup_prefix_generation_from_provided_command( - ${_language} ${_target} "${_targetConfigScript}" "${_prefixFile}" _cmds ${_prefixHeaderFiles}) - else() - cotire_setup_prefix_generation_from_unity_command( - ${_language} ${_target} "${_targetConfigScript}" "${_prefixFile}" "${_unityFile}" _cmds ${_unitySourceFiles}) - endif() - # check if selected language has enough sources at all - list (LENGTH _sourceFiles _numberOfSources) - if (_numberOfSources LESS ${COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES}) - set (_targetUsePCH FALSE) - else() - get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER) - endif() - if (_targetUsePCH) - cotire_make_pch_file_path(${_language} ${_target} _pchFile) - if (_pchFile) - # first file in _sourceFiles is passed as the host file - cotire_setup_pch_file_compilation( - ${_language} ${_target} "${_targetConfigScript}" "${_prefixFile}" "${_pchFile}" ${_sourceFiles}) - cotire_setup_pch_file_inclusion( - ${_language} ${_target} ${_wholeTarget} "${_prefixFile}" "${_pchFile}" ${_sourceFiles}) - endif() - elseif (_prefixHeaderFiles) - # user provided prefix header must be included unconditionally - cotire_setup_prefix_file_inclusion(${_language} ${_target} "${_prefixFile}" ${_sourceFiles}) - endif() - endif() - # mark target as cotired for language - set_property(TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE "${_unityFiles}") - if (_prefixFile) - set_property(TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER "${_prefixFile}") - if (_targetUsePCH AND _pchFile) - set_property(TARGET ${_target} PROPERTY COTIRE_${_language}_PRECOMPILED_HEADER "${_pchFile}") - endif() - endif() - set (${_cmdsVar} ${_cmds} PARENT_SCOPE) -endfunction() - -function (cotire_setup_clean_target _target) - set (_cleanTargetName "${_target}${COTIRE_CLEAN_TARGET_SUFFIX}") - if (NOT TARGET "${_cleanTargetName}") - cotire_set_cmd_to_prologue(_cmds) - get_filename_component(_outputDir "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" ABSOLUTE) - list (APPEND _cmds -P "${COTIRE_CMAKE_MODULE_FILE}" "cleanup" "${_outputDir}" "${COTIRE_INTDIR}" "${_target}") - add_custom_target(${_cleanTargetName} - COMMAND ${_cmds} - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - COMMENT "Cleaning up target ${_target} cotire generated files" - VERBATIM) - cotire_init_target("${_cleanTargetName}") - endif() -endfunction() - -function (cotire_setup_pch_target _languages _configurations _target) - if ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja") - # for makefile based generators, we add a custom target to trigger the generation of the cotire related files - set (_dependsFiles "") - foreach (_language ${_languages}) - set (_props COTIRE_${_language}_PREFIX_HEADER COTIRE_${_language}_UNITY_SOURCE) - if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" AND NOT - (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang")) - # MSVC, Intel and clang-cl only create precompiled header as a side effect - list (INSERT _props 0 COTIRE_${_language}_PRECOMPILED_HEADER) - endif() - cotire_get_first_set_property_value(_dependsFile TARGET ${_target} ${_props}) - if (_dependsFile) - list (APPEND _dependsFiles "${_dependsFile}") - endif() - endforeach() - if (_dependsFiles) - set (_pchTargetName "${_target}${COTIRE_PCH_TARGET_SUFFIX}") - add_custom_target("${_pchTargetName}" DEPENDS ${_dependsFiles}) - cotire_init_target("${_pchTargetName}") - cotire_add_to_pch_all_target(${_pchTargetName}) - endif() - else() - # for other generators, we add the "clean all" target to clean up the precompiled header - cotire_setup_clean_all_target() - endif() -endfunction() - -function (cotire_filter_object_libraries _target _objectLibrariesVar) - set (_objectLibraries "") - foreach (_source ${ARGN}) - if (_source MATCHES "^\\$$") - list (APPEND _objectLibraries "${_source}") - endif() - endforeach() - set (${_objectLibrariesVar} ${_objectLibraries} PARENT_SCOPE) -endfunction() - -function (cotire_collect_unity_target_sources _target _languages _unityTargetSourcesVar) - get_target_property(_targetSourceFiles ${_target} SOURCES) - set (_unityTargetSources ${_targetSourceFiles}) - foreach (_language ${_languages}) - get_property(_unityFiles TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE) - if (_unityFiles) - # remove source files that are included in the unity source - set (_sourceFiles "") - set (_excludedSources "") - set (_cotiredSources "") - cotire_filter_language_source_files(${_language} ${_target} _sourceFiles _excludedSources _cotiredSources ${_targetSourceFiles}) - if (_sourceFiles OR _cotiredSources) - list (REMOVE_ITEM _unityTargetSources ${_sourceFiles} ${_cotiredSources}) - endif() - # add unity source files instead - list (APPEND _unityTargetSources ${_unityFiles}) - endif() - endforeach() - # handle object libraries which are part of the target's sources - get_target_property(_linkLibrariesStrategy ${_target} COTIRE_UNITY_LINK_LIBRARIES_INIT) - if ("${_linkLibrariesStrategy}" MATCHES "^COPY_UNITY$") - cotire_filter_object_libraries(${_target} _objectLibraries ${_targetSourceFiles}) - if (_objectLibraries) - cotire_map_libraries("${_linkLibrariesStrategy}" _unityObjectLibraries ${_objectLibraries}) - list (REMOVE_ITEM _unityTargetSources ${_objectLibraries}) - list (APPEND _unityTargetSources ${_unityObjectLibraries}) - endif() - endif() - set (${_unityTargetSourcesVar} ${_unityTargetSources} PARENT_SCOPE) -endfunction() - -function (cotire_setup_unity_target_pch_usage _languages _target) - foreach (_language ${_languages}) - get_property(_unityFiles TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE) - if (_unityFiles) - get_property(_userPrefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER_INIT) - get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER) - if (_userPrefixFile AND _prefixFile) - # user provided prefix header must be included unconditionally by unity sources - cotire_setup_prefix_file_inclusion(${_language} ${_target} "${_prefixFile}" ${_unityFiles}) - endif() - endif() - endforeach() -endfunction() - -function (cotire_setup_unity_build_target _languages _configurations _target) - get_target_property(_unityTargetName ${_target} COTIRE_UNITY_TARGET_NAME) - if (NOT _unityTargetName) - set (_unityTargetName "${_target}${COTIRE_UNITY_BUILD_TARGET_SUFFIX}") - endif() - # determine unity target sub type - get_target_property(_targetType ${_target} TYPE) - if ("${_targetType}" STREQUAL "EXECUTABLE") - set (_unityTargetSubType "") - elseif (_targetType MATCHES "(STATIC|SHARED|MODULE|OBJECT)_LIBRARY") - set (_unityTargetSubType "${CMAKE_MATCH_1}") - else() - message (WARNING "cotire: target ${_target} has unknown target type ${_targetType}.") - return() - endif() - # determine unity target sources - set (_unityTargetSources "") - cotire_collect_unity_target_sources(${_target} "${_languages}" _unityTargetSources) - # prevent AUTOMOC, AUTOUIC and AUTORCC properties from being set when the unity target is created - set (CMAKE_AUTOMOC OFF) - set (CMAKE_AUTOUIC OFF) - set (CMAKE_AUTORCC OFF) - if (COTIRE_DEBUG) - message (STATUS "add target ${_targetType} ${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources}") - endif() - # generate unity target - if ("${_targetType}" STREQUAL "EXECUTABLE") - add_executable(${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources}) - else() - add_library(${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources}) - endif() - # copy output location properties - set (_outputDirProperties - ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_ - LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_ - RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_) - if (COTIRE_UNITY_OUTPUT_DIRECTORY) - set (_setDefaultOutputDir TRUE) - if (IS_ABSOLUTE "${COTIRE_UNITY_OUTPUT_DIRECTORY}") - set (_outputDir "${COTIRE_UNITY_OUTPUT_DIRECTORY}") - else() - # append relative COTIRE_UNITY_OUTPUT_DIRECTORY to target's actual output directory - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties}) - cotire_resolve_config_properties("${_configurations}" _properties ${_outputDirProperties}) - foreach (_property ${_properties}) - get_property(_outputDir TARGET ${_target} PROPERTY ${_property}) - if (_outputDir) - get_filename_component(_outputDir "${_outputDir}/${COTIRE_UNITY_OUTPUT_DIRECTORY}" ABSOLUTE) - set_property(TARGET ${_unityTargetName} PROPERTY ${_property} "${_outputDir}") - set (_setDefaultOutputDir FALSE) - endif() - endforeach() - if (_setDefaultOutputDir) - get_filename_component(_outputDir "${CMAKE_CURRENT_BINARY_DIR}/${COTIRE_UNITY_OUTPUT_DIRECTORY}" ABSOLUTE) - endif() - endif() - if (_setDefaultOutputDir) - set_target_properties(${_unityTargetName} PROPERTIES - ARCHIVE_OUTPUT_DIRECTORY "${_outputDir}" - LIBRARY_OUTPUT_DIRECTORY "${_outputDir}" - RUNTIME_OUTPUT_DIRECTORY "${_outputDir}") - endif() - else() - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - ${_outputDirProperties}) - endif() - # copy output name - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_ - LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_ - OUTPUT_NAME OUTPUT_NAME_ - RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_ - PREFIX _POSTFIX SUFFIX - IMPORT_PREFIX IMPORT_SUFFIX) - # copy compile stuff - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - COMPILE_DEFINITIONS COMPILE_DEFINITIONS_ - COMPILE_FLAGS COMPILE_OPTIONS - Fortran_FORMAT Fortran_MODULE_DIRECTORY - INCLUDE_DIRECTORIES - INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_ - POSITION_INDEPENDENT_CODE - C_COMPILER_LAUNCHER CXX_COMPILER_LAUNCHER - C_INCLUDE_WHAT_YOU_USE CXX_INCLUDE_WHAT_YOU_USE - C_VISIBILITY_PRESET CXX_VISIBILITY_PRESET VISIBILITY_INLINES_HIDDEN - C_CLANG_TIDY CXX_CLANG_TIDY) - # copy compile features - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED - CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED - COMPILE_FEATURES) - # copy interface stuff - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN - COMPATIBLE_INTERFACE_STRING - INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS - INTERFACE_INCLUDE_DIRECTORIES INTERFACE_SOURCES - INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SYSTEM_INCLUDE_DIRECTORIES - INTERFACE_AUTOUIC_OPTIONS NO_SYSTEM_FROM_IMPORTED) - # copy link stuff - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - BUILD_WITH_INSTALL_RPATH BUILD_WITH_INSTALL_NAME_DIR - INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH - LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED - LINK_FLAGS LINK_FLAGS_ - LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_ - LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_ - LINK_SEARCH_START_STATIC LINK_SEARCH_END_STATIC - STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_ - NO_SONAME SOVERSION VERSION - LINK_WHAT_YOU_USE BUILD_RPATH) - # copy cmake stuff - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - IMPLICIT_DEPENDS_INCLUDE_TRANSFORM RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK) - # copy Apple platform specific stuff - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - BUNDLE BUNDLE_EXTENSION FRAMEWORK FRAMEWORK_VERSION INSTALL_NAME_DIR - MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_RPATH - OSX_ARCHITECTURES OSX_ARCHITECTURES_ PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST - IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE) - # copy Windows platform specific stuff - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - GNUtoMS - COMPILE_PDB_NAME COMPILE_PDB_NAME_ - COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_ - PDB_NAME PDB_NAME_ PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_ - VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION - VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE - VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK - VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION - VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER - VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION - VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES - WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS - DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE - VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY) - # copy Android platform specific stuff - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - ANDROID_API ANDROID_API_MIN ANDROID_GUI - ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES - ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR - ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES - ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH - ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE) - # copy CUDA platform specific stuff - cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} - CUDA_PTX_COMPILATION CUDA_SEPARABLE_COMPILATION CUDA_RESOLVE_DEVICE_SYMBOLS - CUDA_EXTENSIONS CUDA_STANDARD CUDA_STANDARD_REQUIRED) - # use output name from original target - get_target_property(_targetOutputName ${_unityTargetName} OUTPUT_NAME) - if (NOT _targetOutputName) - set_property(TARGET ${_unityTargetName} PROPERTY OUTPUT_NAME "${_target}") - endif() - # use export symbol from original target - cotire_get_target_export_symbol("${_target}" _defineSymbol) - if (_defineSymbol) - set_property(TARGET ${_unityTargetName} PROPERTY DEFINE_SYMBOL "${_defineSymbol}") - if ("${_targetType}" STREQUAL "EXECUTABLE") - set_property(TARGET ${_unityTargetName} PROPERTY ENABLE_EXPORTS TRUE) - endif() - endif() - # enable parallel compilation for MSVC - if (MSVC AND "${CMAKE_GENERATOR}" MATCHES "Visual Studio") - list (LENGTH _unityTargetSources _numberOfUnityTargetSources) - if (_numberOfUnityTargetSources GREATER 1) - set_property(TARGET ${_unityTargetName} APPEND PROPERTY COMPILE_OPTIONS "/MP") - endif() - endif() - cotire_init_target(${_unityTargetName}) - cotire_add_to_unity_all_target(${_unityTargetName}) - set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_TARGET_NAME "${_unityTargetName}") -endfunction(cotire_setup_unity_build_target) - -function (cotire_target _target) - set(_options "") - set(_oneValueArgs "") - set(_multiValueArgs LANGUAGES CONFIGURATIONS) - cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) - if (NOT _option_LANGUAGES) - get_property (_option_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES) - endif() - if (NOT _option_CONFIGURATIONS) - cotire_get_configuration_types(_option_CONFIGURATIONS) - endif() - # check if cotire can be applied to target at all - cotire_is_target_supported(${_target} _isSupported) - if (NOT _isSupported) - get_target_property(_imported ${_target} IMPORTED) - get_target_property(_targetType ${_target} TYPE) - if (_imported) - message (WARNING "cotire: imported ${_targetType} target ${_target} cannot be cotired.") - else() - message (STATUS "cotire: ${_targetType} target ${_target} cannot be cotired.") - endif() - return() - endif() - # resolve alias - get_target_property(_aliasName ${_target} ALIASED_TARGET) - if (_aliasName) - if (COTIRE_DEBUG) - message (STATUS "${_target} is an alias. Applying cotire to aliased target ${_aliasName} instead.") - endif() - set (_target ${_aliasName}) - endif() - # check if target needs to be cotired for build type - # when using configuration types, the test is performed at build time - cotire_init_cotire_target_properties(${_target}) - if (NOT CMAKE_CONFIGURATION_TYPES) - if (CMAKE_BUILD_TYPE) - list (FIND _option_CONFIGURATIONS "${CMAKE_BUILD_TYPE}" _index) - else() - list (FIND _option_CONFIGURATIONS "None" _index) - endif() - if (_index EQUAL -1) - if (COTIRE_DEBUG) - message (STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} not cotired (${_option_CONFIGURATIONS})") - endif() - return() - endif() - endif() - # when not using configuration types, immediately create cotire intermediate dir - if (NOT CMAKE_CONFIGURATION_TYPES) - cotire_get_intermediate_dir(_baseDir) - file (MAKE_DIRECTORY "${_baseDir}") - endif() - # choose languages that apply to the target - cotire_choose_target_languages("${_target}" _targetLanguages _wholeTarget ${_option_LANGUAGES}) - if (NOT _targetLanguages) - return() - endif() - set (_cmds "") - foreach (_language ${_targetLanguages}) - cotire_process_target_language("${_language}" "${_option_CONFIGURATIONS}" ${_target} ${_wholeTarget} _cmd) - if (_cmd) - list (APPEND _cmds ${_cmd}) - endif() - endforeach() - get_target_property(_targetAddSCU ${_target} COTIRE_ADD_UNITY_BUILD) - if (_targetAddSCU) - cotire_setup_unity_build_target("${_targetLanguages}" "${_option_CONFIGURATIONS}" ${_target}) - endif() - get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER) - if (_targetUsePCH) - cotire_setup_target_pch_usage("${_targetLanguages}" ${_target} ${_wholeTarget} ${_cmds}) - cotire_setup_pch_target("${_targetLanguages}" "${_option_CONFIGURATIONS}" ${_target}) - if (_targetAddSCU) - cotire_setup_unity_target_pch_usage("${_targetLanguages}" ${_target}) - endif() - endif() - get_target_property(_targetAddCleanTarget ${_target} COTIRE_ADD_CLEAN) - if (_targetAddCleanTarget) - cotire_setup_clean_target(${_target}) - endif() -endfunction(cotire_target) - -function (cotire_map_libraries _strategy _mappedLibrariesVar) - set (_mappedLibraries "") - foreach (_library ${ARGN}) - if (_library MATCHES "^\\$$") - set (_libraryName "${CMAKE_MATCH_1}") - set (_linkOnly TRUE) - set (_objectLibrary FALSE) - elseif (_library MATCHES "^\\$$") - set (_libraryName "${CMAKE_MATCH_1}") - set (_linkOnly FALSE) - set (_objectLibrary TRUE) - else() - set (_libraryName "${_library}") - set (_linkOnly FALSE) - set (_objectLibrary FALSE) - endif() - if ("${_strategy}" MATCHES "COPY_UNITY") - cotire_is_target_supported(${_libraryName} _isSupported) - if (_isSupported) - # use target's corresponding unity target, if available - get_target_property(_libraryUnityTargetName ${_libraryName} COTIRE_UNITY_TARGET_NAME) - if (TARGET "${_libraryUnityTargetName}") - if (_linkOnly) - list (APPEND _mappedLibraries "$") - elseif (_objectLibrary) - list (APPEND _mappedLibraries "$") - else() - list (APPEND _mappedLibraries "${_libraryUnityTargetName}") - endif() - else() - list (APPEND _mappedLibraries "${_library}") - endif() - else() - list (APPEND _mappedLibraries "${_library}") - endif() - else() - list (APPEND _mappedLibraries "${_library}") - endif() - endforeach() - list (REMOVE_DUPLICATES _mappedLibraries) - set (${_mappedLibrariesVar} ${_mappedLibraries} PARENT_SCOPE) -endfunction() - -function (cotire_target_link_libraries _target) - cotire_is_target_supported(${_target} _isSupported) - if (NOT _isSupported) - return() - endif() - get_target_property(_unityTargetName ${_target} COTIRE_UNITY_TARGET_NAME) - if (TARGET "${_unityTargetName}") - get_target_property(_linkLibrariesStrategy ${_target} COTIRE_UNITY_LINK_LIBRARIES_INIT) - if (COTIRE_DEBUG) - message (STATUS "unity target ${_unityTargetName} link strategy: ${_linkLibrariesStrategy}") - endif() - if ("${_linkLibrariesStrategy}" MATCHES "^(COPY|COPY_UNITY)$") - get_target_property(_linkLibraries ${_target} LINK_LIBRARIES) - if (_linkLibraries) - cotire_map_libraries("${_linkLibrariesStrategy}" _unityLinkLibraries ${_linkLibraries}) - set_target_properties(${_unityTargetName} PROPERTIES LINK_LIBRARIES "${_unityLinkLibraries}") - if (COTIRE_DEBUG) - message (STATUS "unity target ${_unityTargetName} link libraries: ${_unityLinkLibraries}") - endif() - endif() - get_target_property(_interfaceLinkLibraries ${_target} INTERFACE_LINK_LIBRARIES) - if (_interfaceLinkLibraries) - cotire_map_libraries("${_linkLibrariesStrategy}" _unityLinkInterfaceLibraries ${_interfaceLinkLibraries}) - set_target_properties(${_unityTargetName} PROPERTIES INTERFACE_LINK_LIBRARIES "${_unityLinkInterfaceLibraries}") - if (COTIRE_DEBUG) - message (STATUS "unity target ${_unityTargetName} interface link libraries: ${_unityLinkInterfaceLibraries}") - endif() - endif() - get_target_property(_manualDependencies ${_target} MANUALLY_ADDED_DEPENDENCIES) - if (_manualDependencies) - cotire_map_libraries("${_linkLibrariesStrategy}" _unityManualDependencies ${_manualDependencies}) - if (_unityManualDependencies) - add_dependencies("${_unityTargetName}" ${_unityManualDependencies}) - endif() - endif() - endif() - endif() -endfunction(cotire_target_link_libraries) - -function (cotire_cleanup _binaryDir _cotireIntermediateDirName _targetName) - if (_targetName) - file (GLOB_RECURSE _cotireFiles "${_binaryDir}/${_targetName}*.*") - else() - file (GLOB_RECURSE _cotireFiles "${_binaryDir}/*.*") - endif() - # filter files in intermediate directory - set (_filesToRemove "") - foreach (_file ${_cotireFiles}) - get_filename_component(_dir "${_file}" DIRECTORY) - get_filename_component(_dirName "${_dir}" NAME) - if ("${_dirName}" STREQUAL "${_cotireIntermediateDirName}") - list (APPEND _filesToRemove "${_file}") - endif() - endforeach() - if (_filesToRemove) - if (COTIRE_VERBOSE) - message (STATUS "cleaning up ${_filesToRemove}") - endif() - file (REMOVE ${_filesToRemove}) - endif() -endfunction() - -function (cotire_init_target _targetName) - if (COTIRE_TARGETS_FOLDER) - set_target_properties(${_targetName} PROPERTIES FOLDER "${COTIRE_TARGETS_FOLDER}") - endif() - set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_ALL TRUE) - if (MSVC_IDE) - set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE) - endif() -endfunction() - -function (cotire_add_to_pch_all_target _pchTargetName) - set (_targetName "${COTIRE_PCH_ALL_TARGET_NAME}") - if (NOT TARGET "${_targetName}") - add_custom_target("${_targetName}" - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - VERBATIM) - cotire_init_target("${_targetName}") - endif() - cotire_setup_clean_all_target() - add_dependencies(${_targetName} ${_pchTargetName}) -endfunction() - -function (cotire_add_to_unity_all_target _unityTargetName) - set (_targetName "${COTIRE_UNITY_BUILD_ALL_TARGET_NAME}") - if (NOT TARGET "${_targetName}") - add_custom_target("${_targetName}" - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - VERBATIM) - cotire_init_target("${_targetName}") - endif() - cotire_setup_clean_all_target() - add_dependencies(${_targetName} ${_unityTargetName}) -endfunction() - -function (cotire_setup_clean_all_target) - set (_targetName "${COTIRE_CLEAN_ALL_TARGET_NAME}") - if (NOT TARGET "${_targetName}") - cotire_set_cmd_to_prologue(_cmds) - list (APPEND _cmds -P "${COTIRE_CMAKE_MODULE_FILE}" "cleanup" "${CMAKE_BINARY_DIR}" "${COTIRE_INTDIR}") - add_custom_target(${_targetName} - COMMAND ${_cmds} - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" - COMMENT "Cleaning up all cotire generated files" - VERBATIM) - cotire_init_target("${_targetName}") - endif() -endfunction() - -function (cotire) - set(_options "") - set(_oneValueArgs "") - set(_multiValueArgs LANGUAGES CONFIGURATIONS) - cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN}) - set (_targets ${_option_UNPARSED_ARGUMENTS}) - foreach (_target ${_targets}) - if (TARGET ${_target}) - cotire_target(${_target} LANGUAGES ${_option_LANGUAGES} CONFIGURATIONS ${_option_CONFIGURATIONS}) - else() - message (WARNING "cotire: ${_target} is not a target.") - endif() - endforeach() - foreach (_target ${_targets}) - if (TARGET ${_target}) - cotire_target_link_libraries(${_target}) - endif() - endforeach() -endfunction() - -if (CMAKE_SCRIPT_MODE_FILE) - - # cotire is being run in script mode - # locate -P on command args - set (COTIRE_ARGC -1) - foreach (_index RANGE ${CMAKE_ARGC}) - if (COTIRE_ARGC GREATER -1) - set (COTIRE_ARGV${COTIRE_ARGC} "${CMAKE_ARGV${_index}}") - math (EXPR COTIRE_ARGC "${COTIRE_ARGC} + 1") - elseif ("${CMAKE_ARGV${_index}}" STREQUAL "-P") - set (COTIRE_ARGC 0) - endif() - endforeach() - - # include target script if available - if ("${COTIRE_ARGV2}" MATCHES "\\.cmake$") - # the included target scripts sets up additional variables relating to the target (e.g., COTIRE_TARGET_SOURCES) - include("${COTIRE_ARGV2}") - endif() - - if (COTIRE_DEBUG) - message (STATUS "${COTIRE_ARGV0} ${COTIRE_ARGV1} ${COTIRE_ARGV2} ${COTIRE_ARGV3} ${COTIRE_ARGV4} ${COTIRE_ARGV5}") - endif() - - if (NOT COTIRE_BUILD_TYPE) - set (COTIRE_BUILD_TYPE "None") - endif() - string (TOUPPER "${COTIRE_BUILD_TYPE}" _upperConfig) - set (_includeDirs ${COTIRE_TARGET_INCLUDE_DIRECTORIES_${_upperConfig}}) - set (_systemIncludeDirs ${COTIRE_TARGET_SYSTEM_INCLUDE_DIRECTORIES_${_upperConfig}}) - set (_compileDefinitions ${COTIRE_TARGET_COMPILE_DEFINITIONS_${_upperConfig}}) - set (_compileFlags ${COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}}) - # check if target has been cotired for actual build type COTIRE_BUILD_TYPE - list (FIND COTIRE_TARGET_CONFIGURATION_TYPES "${COTIRE_BUILD_TYPE}" _index) - if (_index GREATER -1) - set (_sources ${COTIRE_TARGET_SOURCES}) - set (_sourcesDefinitions ${COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig}}) - else() - if (COTIRE_DEBUG) - message (STATUS "COTIRE_BUILD_TYPE=${COTIRE_BUILD_TYPE} not cotired (${COTIRE_TARGET_CONFIGURATION_TYPES})") - endif() - set (_sources "") - set (_sourcesDefinitions "") - endif() - set (_targetPreUndefs ${COTIRE_TARGET_PRE_UNDEFS}) - set (_targetPostUndefs ${COTIRE_TARGET_POST_UNDEFS}) - set (_sourcesPreUndefs ${COTIRE_TARGET_SOURCES_PRE_UNDEFS}) - set (_sourcesPostUndefs ${COTIRE_TARGET_SOURCES_POST_UNDEFS}) - - if ("${COTIRE_ARGV1}" STREQUAL "unity") - - if (XCODE) - # executing pre-build action under Xcode, check dependency on target script - set (_dependsOption DEPENDS "${COTIRE_ARGV2}") - else() - # executing custom command, no need to re-check for dependencies - set (_dependsOption "") - endif() - - cotire_select_unity_source_files("${COTIRE_ARGV3}" _sources ${_sources}) - - cotire_generate_unity_source( - "${COTIRE_ARGV3}" ${_sources} - LANGUAGE "${COTIRE_TARGET_LANGUAGE}" - SOURCES_COMPILE_DEFINITIONS ${_sourcesDefinitions} - PRE_UNDEFS ${_targetPreUndefs} - POST_UNDEFS ${_targetPostUndefs} - SOURCES_PRE_UNDEFS ${_sourcesPreUndefs} - SOURCES_POST_UNDEFS ${_sourcesPostUndefs} - ${_dependsOption}) - - elseif ("${COTIRE_ARGV1}" STREQUAL "prefix") - - if (XCODE) - # executing pre-build action under Xcode, check dependency on unity file and prefix dependencies - set (_dependsOption DEPENDS "${COTIRE_ARGV4}" ${COTIRE_TARGET_PREFIX_DEPENDS}) - else() - # executing custom command, no need to re-check for dependencies - set (_dependsOption "") - endif() - - set (_files "") - foreach (_index RANGE 4 ${COTIRE_ARGC}) - if (COTIRE_ARGV${_index}) - list (APPEND _files "${COTIRE_ARGV${_index}}") - endif() - endforeach() - - cotire_generate_prefix_header( - "${COTIRE_ARGV3}" ${_files} - COMPILER_LAUNCHER "${COTIRE_TARGET_${COTIRE_TARGET_LANGUAGE}_COMPILER_LAUNCHER}" - COMPILER_EXECUTABLE "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER}" - COMPILER_ARG1 ${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ARG1} - COMPILER_ID "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ID}" - COMPILER_VERSION "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_VERSION}" - LANGUAGE "${COTIRE_TARGET_LANGUAGE}" - IGNORE_PATH "${COTIRE_TARGET_IGNORE_PATH};${COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH}" - INCLUDE_PATH ${COTIRE_TARGET_INCLUDE_PATH} - IGNORE_EXTENSIONS "${CMAKE_${COTIRE_TARGET_LANGUAGE}_SOURCE_FILE_EXTENSIONS};${COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS}" - INCLUDE_PRIORITY_PATH ${COTIRE_TARGET_INCLUDE_PRIORITY_PATH} - INCLUDE_DIRECTORIES ${_includeDirs} - SYSTEM_INCLUDE_DIRECTORIES ${_systemIncludeDirs} - COMPILE_DEFINITIONS ${_compileDefinitions} - COMPILE_FLAGS ${_compileFlags} - ${_dependsOption}) - - elseif ("${COTIRE_ARGV1}" STREQUAL "precompile") - - set (_files "") - foreach (_index RANGE 5 ${COTIRE_ARGC}) - if (COTIRE_ARGV${_index}) - list (APPEND _files "${COTIRE_ARGV${_index}}") - endif() - endforeach() - - cotire_precompile_prefix_header( - "${COTIRE_ARGV3}" "${COTIRE_ARGV4}" "${COTIRE_ARGV5}" - COMPILER_LAUNCHER "${COTIRE_TARGET_${COTIRE_TARGET_LANGUAGE}_COMPILER_LAUNCHER}" - COMPILER_EXECUTABLE "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER}" - COMPILER_ARG1 ${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ARG1} - COMPILER_ID "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ID}" - COMPILER_VERSION "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_VERSION}" - LANGUAGE "${COTIRE_TARGET_LANGUAGE}" - INCLUDE_DIRECTORIES ${_includeDirs} - SYSTEM_INCLUDE_DIRECTORIES ${_systemIncludeDirs} - COMPILE_DEFINITIONS ${_compileDefinitions} - COMPILE_FLAGS ${_compileFlags}) - - elseif ("${COTIRE_ARGV1}" STREQUAL "combine") - - if (COTIRE_TARGET_LANGUAGE) - set (_combinedFile "${COTIRE_ARGV3}") - set (_startIndex 4) - else() - set (_combinedFile "${COTIRE_ARGV2}") - set (_startIndex 3) - endif() - set (_files "") - foreach (_index RANGE ${_startIndex} ${COTIRE_ARGC}) - if (COTIRE_ARGV${_index}) - list (APPEND _files "${COTIRE_ARGV${_index}}") - endif() - endforeach() - - if (XCODE) - # executing pre-build action under Xcode, check dependency on files to be combined - set (_dependsOption DEPENDS ${_files}) - else() - # executing custom command, no need to re-check for dependencies - set (_dependsOption "") - endif() - - if (COTIRE_TARGET_LANGUAGE) - cotire_generate_unity_source( - "${_combinedFile}" ${_files} - LANGUAGE "${COTIRE_TARGET_LANGUAGE}" - ${_dependsOption}) - else() - cotire_generate_unity_source("${_combinedFile}" ${_files} ${_dependsOption}) - endif() - - elseif ("${COTIRE_ARGV1}" STREQUAL "cleanup") - - cotire_cleanup("${COTIRE_ARGV2}" "${COTIRE_ARGV3}" "${COTIRE_ARGV4}") - - else() - message (FATAL_ERROR "cotire: unknown command \"${COTIRE_ARGV1}\".") - endif() - -else() - - # cotire is being run in include mode - # set up all variable and property definitions - - if (NOT DEFINED COTIRE_DEBUG_INIT) - if (DEFINED COTIRE_DEBUG) - set (COTIRE_DEBUG_INIT ${COTIRE_DEBUG}) - else() - set (COTIRE_DEBUG_INIT FALSE) - endif() - endif() - option (COTIRE_DEBUG "Enable cotire debugging output?" ${COTIRE_DEBUG_INIT}) - - if (NOT DEFINED COTIRE_VERBOSE_INIT) - if (DEFINED COTIRE_VERBOSE) - set (COTIRE_VERBOSE_INIT ${COTIRE_VERBOSE}) - else() - set (COTIRE_VERBOSE_INIT FALSE) - endif() - endif() - option (COTIRE_VERBOSE "Enable cotire verbose output?" ${COTIRE_VERBOSE_INIT}) - - set (COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS "inc;inl;ipp" CACHE STRING - "Ignore headers with the listed file extensions from the generated prefix header.") - - set (COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH "" CACHE STRING - "Ignore headers from these directories when generating the prefix header.") - - set (COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS "m;mm" CACHE STRING - "Ignore sources with the listed file extensions from the generated unity source.") - - set (COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES "2" CACHE STRING - "Minimum number of sources in target required to enable use of precompiled header.") - - if (NOT DEFINED COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT) - if (DEFINED COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES) - set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT ${COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES}) - elseif ("${CMAKE_GENERATOR}" MATCHES "JOM|Ninja|Visual Studio") - # enable parallelization for generators that run multiple jobs by default - set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT "-j") - else() - set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT "0") - endif() - endif() - set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES "${COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT}" CACHE STRING - "Maximum number of source files to include in a single unity source file.") - - if (NOT COTIRE_PREFIX_HEADER_FILENAME_SUFFIX) - set (COTIRE_PREFIX_HEADER_FILENAME_SUFFIX "_prefix") - endif() - if (NOT COTIRE_UNITY_SOURCE_FILENAME_SUFFIX) - set (COTIRE_UNITY_SOURCE_FILENAME_SUFFIX "_unity") - endif() - if (NOT COTIRE_INTDIR) - set (COTIRE_INTDIR "cotire") - endif() - if (NOT COTIRE_PCH_ALL_TARGET_NAME) - set (COTIRE_PCH_ALL_TARGET_NAME "all_pch") - endif() - if (NOT COTIRE_UNITY_BUILD_ALL_TARGET_NAME) - set (COTIRE_UNITY_BUILD_ALL_TARGET_NAME "all_unity") - endif() - if (NOT COTIRE_CLEAN_ALL_TARGET_NAME) - set (COTIRE_CLEAN_ALL_TARGET_NAME "clean_cotire") - endif() - if (NOT COTIRE_CLEAN_TARGET_SUFFIX) - set (COTIRE_CLEAN_TARGET_SUFFIX "_clean_cotire") - endif() - if (NOT COTIRE_PCH_TARGET_SUFFIX) - set (COTIRE_PCH_TARGET_SUFFIX "_pch") - endif() - if (MSVC) - # MSVC default PCH memory scaling factor of 100 percent (75 MB) is too small for template heavy C++ code - # use a bigger default factor of 170 percent (128 MB) - if (NOT DEFINED COTIRE_PCH_MEMORY_SCALING_FACTOR) - set (COTIRE_PCH_MEMORY_SCALING_FACTOR "170") - endif() - endif() - if (NOT COTIRE_UNITY_BUILD_TARGET_SUFFIX) - set (COTIRE_UNITY_BUILD_TARGET_SUFFIX "_unity") - endif() - if (NOT DEFINED COTIRE_TARGETS_FOLDER) - set (COTIRE_TARGETS_FOLDER "cotire") - endif() - if (NOT DEFINED COTIRE_UNITY_OUTPUT_DIRECTORY) - if ("${CMAKE_GENERATOR}" MATCHES "Ninja") - # generated Ninja build files do not work if the unity target produces the same output file as the cotired target - set (COTIRE_UNITY_OUTPUT_DIRECTORY "unity") - else() - set (COTIRE_UNITY_OUTPUT_DIRECTORY "") - endif() - endif() - - # define cotire cache variables - - define_property( - CACHED_VARIABLE PROPERTY "COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH" - BRIEF_DOCS "Ignore headers from these directories when generating the prefix header." - FULL_DOCS - "The variable can be set to a semicolon separated list of include directories." - "If a header file is found in one of these directories or sub-directories, it will be excluded from the generated prefix header." - "If not defined, defaults to empty list." - ) - - define_property( - CACHED_VARIABLE PROPERTY "COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS" - BRIEF_DOCS "Ignore includes with the listed file extensions from the generated prefix header." - FULL_DOCS - "The variable can be set to a semicolon separated list of file extensions." - "If a header file extension matches one in the list, it will be excluded from the generated prefix header." - "Includes with an extension in CMAKE__SOURCE_FILE_EXTENSIONS are always ignored." - "If not defined, defaults to inc;inl;ipp." - ) - - define_property( - CACHED_VARIABLE PROPERTY "COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS" - BRIEF_DOCS "Exclude sources with the listed file extensions from the generated unity source." - FULL_DOCS - "The variable can be set to a semicolon separated list of file extensions." - "If a source file extension matches one in the list, it will be excluded from the generated unity source file." - "Source files with an extension in CMAKE__IGNORE_EXTENSIONS are always excluded." - "If not defined, defaults to m;mm." - ) - - define_property( - CACHED_VARIABLE PROPERTY "COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES" - BRIEF_DOCS "Minimum number of sources in target required to enable use of precompiled header." - FULL_DOCS - "The variable can be set to an integer > 0." - "If a target contains less than that number of source files, cotire will not enable the use of the precompiled header for the target." - "If not defined, defaults to 2." - ) - - define_property( - CACHED_VARIABLE PROPERTY "COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES" - BRIEF_DOCS "Maximum number of source files to include in a single unity source file." - FULL_DOCS - "This may be set to an integer >= 0." - "If 0, cotire will only create a single unity source file." - "If a target contains more than that number of source files, cotire will create multiple unity source files for it." - "Can be set to \"-j\" to optimize the count of unity source files for the number of available processor cores." - "Can be set to \"-j jobs\" to optimize the number of unity source files for the given number of simultaneous jobs." - "Is used to initialize the target property COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES." - "Defaults to \"-j\" for the generators Visual Studio, JOM or Ninja. Defaults to 0 otherwise." - ) - - # define cotire directory properties - - define_property( - DIRECTORY PROPERTY "COTIRE_ENABLE_PRECOMPILED_HEADER" - BRIEF_DOCS "Modify build command of cotired targets added in this directory to make use of the generated precompiled header." - FULL_DOCS - "See target property COTIRE_ENABLE_PRECOMPILED_HEADER." - ) - - define_property( - DIRECTORY PROPERTY "COTIRE_ADD_UNITY_BUILD" - BRIEF_DOCS "Add a new target that performs a unity build for cotired targets added in this directory." - FULL_DOCS - "See target property COTIRE_ADD_UNITY_BUILD." - ) - - define_property( - DIRECTORY PROPERTY "COTIRE_ADD_CLEAN" - BRIEF_DOCS "Add a new target that cleans all cotire generated files for cotired targets added in this directory." - FULL_DOCS - "See target property COTIRE_ADD_CLEAN." - ) - - define_property( - DIRECTORY PROPERTY "COTIRE_PREFIX_HEADER_IGNORE_PATH" - BRIEF_DOCS "Ignore headers from these directories when generating the prefix header." - FULL_DOCS - "See target property COTIRE_PREFIX_HEADER_IGNORE_PATH." - ) - - define_property( - DIRECTORY PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PATH" - BRIEF_DOCS "Honor headers from these directories when generating the prefix header." - FULL_DOCS - "See target property COTIRE_PREFIX_HEADER_INCLUDE_PATH." - ) - - define_property( - DIRECTORY PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH" - BRIEF_DOCS "Header paths matching one of these directories are put at the top of the prefix header." - FULL_DOCS - "See target property COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH." - ) - - define_property( - DIRECTORY PROPERTY "COTIRE_UNITY_SOURCE_PRE_UNDEFS" - BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file before the inclusion of each source file." - FULL_DOCS - "See target property COTIRE_UNITY_SOURCE_PRE_UNDEFS." - ) - - define_property( - DIRECTORY PROPERTY "COTIRE_UNITY_SOURCE_POST_UNDEFS" - BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file after the inclusion of each source file." - FULL_DOCS - "See target property COTIRE_UNITY_SOURCE_POST_UNDEFS." - ) - - define_property( - DIRECTORY PROPERTY "COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES" - BRIEF_DOCS "Maximum number of source files to include in a single unity source file." - FULL_DOCS - "See target property COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES." - ) - - define_property( - DIRECTORY PROPERTY "COTIRE_UNITY_LINK_LIBRARIES_INIT" - BRIEF_DOCS "Define strategy for setting up the unity target's link libraries." - FULL_DOCS - "See target property COTIRE_UNITY_LINK_LIBRARIES_INIT." - ) - - # define cotire target properties - - define_property( - TARGET PROPERTY "COTIRE_ENABLE_PRECOMPILED_HEADER" INHERITED - BRIEF_DOCS "Modify this target's build command to make use of the generated precompiled header." - FULL_DOCS - "If this property is set to TRUE, cotire will modify the build command to make use of the generated precompiled header." - "Irrespective of the value of this property, cotire will setup custom commands to generate the unity source and prefix header for the target." - "For makefile based generators cotire will also set up a custom target to manually invoke the generation of the precompiled header." - "The target name will be set to this target's name with the suffix _pch appended." - "Inherited from directory." - "Defaults to TRUE." - ) - - define_property( - TARGET PROPERTY "COTIRE_ADD_UNITY_BUILD" INHERITED - BRIEF_DOCS "Add a new target that performs a unity build for this target." - FULL_DOCS - "If this property is set to TRUE, cotire creates a new target of the same type that uses the generated unity source file instead of the target sources." - "Most of the relevant target properties will be copied from this target to the new unity build target." - "Target dependencies and linked libraries have to be manually set up for the new unity build target." - "The unity target name will be set to this target's name with the suffix _unity appended." - "Inherited from directory." - "Defaults to TRUE." - ) - - define_property( - TARGET PROPERTY "COTIRE_ADD_CLEAN" INHERITED - BRIEF_DOCS "Add a new target that cleans all cotire generated files for this target." - FULL_DOCS - "If this property is set to TRUE, cotire creates a new target that clean all files (unity source, prefix header, precompiled header)." - "The clean target name will be set to this target's name with the suffix _clean_cotire appended." - "Inherited from directory." - "Defaults to FALSE." - ) - - define_property( - TARGET PROPERTY "COTIRE_PREFIX_HEADER_IGNORE_PATH" INHERITED - BRIEF_DOCS "Ignore headers from these directories when generating the prefix header." - FULL_DOCS - "The property can be set to a list of directories." - "If a header file is found in one of these directories or sub-directories, it will be excluded from the generated prefix header." - "Inherited from directory." - "If not set, this property is initialized to \${CMAKE_SOURCE_DIR};\${CMAKE_BINARY_DIR}." - ) - - define_property( - TARGET PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PATH" INHERITED - BRIEF_DOCS "Honor headers from these directories when generating the prefix header." - FULL_DOCS - "The property can be set to a list of directories." - "If a header file is found in one of these directories or sub-directories, it will be included in the generated prefix header." - "If a header file is both selected by COTIRE_PREFIX_HEADER_IGNORE_PATH and COTIRE_PREFIX_HEADER_INCLUDE_PATH," - "the option which yields the closer relative path match wins." - "Inherited from directory." - "If not set, this property is initialized to the empty list." - ) - - define_property( - TARGET PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH" INHERITED - BRIEF_DOCS "Header paths matching one of these directories are put at the top of prefix header." - FULL_DOCS - "The property can be set to a list of directories." - "Header file paths matching one of these directories will be inserted at the beginning of the generated prefix header." - "Header files are sorted according to the order of the directories in the property." - "If not set, this property is initialized to the empty list." - ) - - define_property( - TARGET PROPERTY "COTIRE_UNITY_SOURCE_PRE_UNDEFS" INHERITED - BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file before the inclusion of each target source file." - FULL_DOCS - "This may be set to a semicolon-separated list of preprocessor symbols." - "cotire will add corresponding #undef directives to the generated unit source file before each target source file." - "Inherited from directory." - "Defaults to empty string." - ) - - define_property( - TARGET PROPERTY "COTIRE_UNITY_SOURCE_POST_UNDEFS" INHERITED - BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file after the inclusion of each target source file." - FULL_DOCS - "This may be set to a semicolon-separated list of preprocessor symbols." - "cotire will add corresponding #undef directives to the generated unit source file after each target source file." - "Inherited from directory." - "Defaults to empty string." - ) - - define_property( - TARGET PROPERTY "COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES" INHERITED - BRIEF_DOCS "Maximum number of source files to include in a single unity source file." - FULL_DOCS - "This may be set to an integer > 0." - "If a target contains more than that number of source files, cotire will create multiple unity build files for it." - "If not set, cotire will only create a single unity source file." - "Inherited from directory." - "Defaults to empty." - ) - - define_property( - TARGET PROPERTY "COTIRE__UNITY_SOURCE_INIT" - BRIEF_DOCS "User provided unity source file to be used instead of the automatically generated one." - FULL_DOCS - "If set, cotire will only add the given file(s) to the generated unity source file." - "If not set, cotire will add all the target source files to the generated unity source file." - "The property can be set to a user provided unity source file." - "Defaults to empty." - ) - - define_property( - TARGET PROPERTY "COTIRE__PREFIX_HEADER_INIT" - BRIEF_DOCS "User provided prefix header file to be used instead of the automatically generated one." - FULL_DOCS - "If set, cotire will add the given header file(s) to the generated prefix header file." - "If not set, cotire will generate a prefix header by tracking the header files included by the unity source file." - "The property can be set to a user provided prefix header file (e.g., stdafx.h)." - "Defaults to empty." - ) - - define_property( - TARGET PROPERTY "COTIRE_UNITY_LINK_LIBRARIES_INIT" INHERITED - BRIEF_DOCS "Define strategy for setting up unity target's link libraries." - FULL_DOCS - "If this property is empty or set to NONE, the generated unity target's link libraries have to be set up manually." - "If this property is set to COPY, the unity target's link libraries will be copied from this target." - "If this property is set to COPY_UNITY, the unity target's link libraries will be copied from this target with considering existing unity targets." - "Inherited from directory." - "Defaults to empty." - ) - - define_property( - TARGET PROPERTY "COTIRE__UNITY_SOURCE" - BRIEF_DOCS "Read-only property. The generated unity source file(s)." - FULL_DOCS - "cotire sets this property to the path of the generated single computation unit source file for the target." - "Defaults to empty string." - ) - - define_property( - TARGET PROPERTY "COTIRE__PREFIX_HEADER" - BRIEF_DOCS "Read-only property. The generated prefix header file." - FULL_DOCS - "cotire sets this property to the full path of the generated language prefix header for the target." - "Defaults to empty string." - ) - - define_property( - TARGET PROPERTY "COTIRE__PRECOMPILED_HEADER" - BRIEF_DOCS "Read-only property. The generated precompiled header file." - FULL_DOCS - "cotire sets this property to the full path of the generated language precompiled header binary for the target." - "Defaults to empty string." - ) - - define_property( - TARGET PROPERTY "COTIRE_UNITY_TARGET_NAME" - BRIEF_DOCS "The name of the generated unity build target corresponding to this target." - FULL_DOCS - "This property can be set to the desired name of the unity target that will be created by cotire." - "If not set, the unity target name will be set to this target's name with the suffix _unity appended." - "After this target has been processed by cotire, the property is set to the actual name of the generated unity target." - "Defaults to empty string." - ) - - # define cotire source properties - - define_property( - SOURCE PROPERTY "COTIRE_EXCLUDED" - BRIEF_DOCS "Do not modify source file's build command." - FULL_DOCS - "If this property is set to TRUE, the source file's build command will not be modified to make use of the precompiled header." - "The source file will also be excluded from the generated unity source file." - "Source files that have their COMPILE_FLAGS property set will be excluded by default." - "Defaults to FALSE." - ) - - define_property( - SOURCE PROPERTY "COTIRE_DEPENDENCY" - BRIEF_DOCS "Add this source file to dependencies of the automatically generated prefix header file." - FULL_DOCS - "If this property is set to TRUE, the source file is added to dependencies of the generated prefix header file." - "If the file is modified, cotire will re-generate the prefix header source upon build." - "Defaults to FALSE." - ) - - define_property( - SOURCE PROPERTY "COTIRE_UNITY_SOURCE_PRE_UNDEFS" - BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file before the inclusion of this source file." - FULL_DOCS - "This may be set to a semicolon-separated list of preprocessor symbols." - "cotire will add corresponding #undef directives to the generated unit source file before this file is included." - "Defaults to empty string." - ) - - define_property( - SOURCE PROPERTY "COTIRE_UNITY_SOURCE_POST_UNDEFS" - BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file after the inclusion of this source file." - FULL_DOCS - "This may be set to a semicolon-separated list of preprocessor symbols." - "cotire will add corresponding #undef directives to the generated unit source file after this file is included." - "Defaults to empty string." - ) - - define_property( - SOURCE PROPERTY "COTIRE_START_NEW_UNITY_SOURCE" - BRIEF_DOCS "Start a new unity source file which includes this source file as the first one." - FULL_DOCS - "If this property is set to TRUE, cotire will complete the current unity file and start a new one." - "The new unity source file will include this source file as the first one." - "This property essentially works as a separator for unity source files." - "Defaults to FALSE." - ) - - define_property( - SOURCE PROPERTY "COTIRE_TARGET" - BRIEF_DOCS "Read-only property. Mark this source file as cotired for the given target." - FULL_DOCS - "cotire sets this property to the name of target, that the source file's build command has been altered for." - "Defaults to empty string." - ) - - message (STATUS "cotire ${COTIRE_CMAKE_MODULE_VERSION} loaded.") - -endif() diff --git a/cotire/CMakeLists.txt b/cotire/CMakeLists.txt deleted file mode 100644 index ca5270dfd..000000000 --- a/cotire/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# cotire example project - -cmake_minimum_required(VERSION 2.8.12) - -if (POLICY CMP0058) - # Ninja requires custom command byproducts to be explicit - cmake_policy(SET CMP0058 NEW) -endif() - -project (CotireExample) - -set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") - -if (NOT CMAKE_VERSION VERSION_LESS "3.1.0") - set (CMAKE_CXX_STANDARD "98") - set (CMAKE_CXX_EXTENSIONS OFF) -endif() - -include(cotire) - -add_subdirectory(src) diff --git a/cotire/HISTORY.md b/cotire/HISTORY.md deleted file mode 100644 index db42354d9..000000000 --- a/cotire/HISTORY.md +++ /dev/null @@ -1,354 +0,0 @@ -## 1.8.0 (2018-03-18) - -* support for clang-cl.exe under Windows. -* faster prefix header generation for Clang. -* enable parallel compilation of unity target for MSVC. -* CMake 3.9 and 3.10 compatibility fixes. -* disable inclusion of timestamp in precompiled headers for Clang. -* work around ccache reporting incorrect configuration. -* honor `MANUALLY_ADDED_DEPENDENCIES` property upon generation of unity targets. -* use default setting of 2 for `COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES`. -* drop broken support for unity building of targets with automatic CMake Qt processing turned on. -* manual updates. - -## 1.7.10 (2017-06-16) - -* CMake 3.8 compatibility. -* CMake 3.8.0 Qt automoc support (thanks bilke). -* fix Xcode recompiling every time builds happen (thanks gcamp). -* disable PCH messages when `-Wno-pch-messages` flag exists (thanks kbinani). -* work around ccache incompatibility with newer versions of GCC and Clang. -* fix MinGW incompatibility with `BUILD_INTERFACE` generator expression. -* fix handling of `CMAKE_INCLUDE_FLAG_SEP_` variables. - -## 1.7.9 (2016-12-08) - -* CMake 3.6 and 3.7 compatibility. -* fix ccache 3.2 compatibility issues. -* fix bugs with handling language standard related properties (e.g., `CXX_STANDARD`, `CXX_EXTENSIONS`). -* make prefix header generation and precompiled header compilation depend on the compiler executable. -* fix Qt automoc handling for Windows (thanks jcelerier). -* convert Windows paths in include directories to CMake paths (thanks wdx04). -* replace object library with corresponding unity object library when using `COPY_UNITY` linking strategy. -* better error reporting from prefix header generation. - -## 1.7.8 (2016-03-27) - -* fix `COPY_UNITY` linking strategy for private link dependencies. -* honor `CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE` upon handling of target usage requirements. -* reworked setting up of `LINK_LIBRARIES` and `INTERFACE_LINK_LIBRARIES` properties for unity targets. - -## 1.7.7 (2016-03-20) - -* CMake 3.5 compatibility. -* fix bugs related to handling of interface libraries. -* output shorter log messages when using Visual Studio IDE. -* don't disable PCH if CMAKE__COMPILER_ID is not set (thanks jcelerier). -* add support for compiler launchers introduced in CMake 3.4 (thanks misery). - -## 1.7.6 (2015-12-06) - -* fix CMake 3.4 compatibility issues. -* prevent redundant re-generation of prefix header when a target has generated source files. - -## 1.7.5 (2015-10-27) - -* handle visibility target properties (`CXX_VISIBILITY_PRESET` and `VISIBILITY_INLINES_HIDDEN`). -* better handling of include directories and system include directories. -* parse additional system include directories from target compile flags. -* activate select CMake policies. - -## 1.7.4 (2015-10-10) - -* set up single unity source file for prefix header generation. -* increase MSVC default PCH memory to 128M. -* remove obsolete code. - -## 1.7.3 (2015-07-25) - -* handle language standard target properties (e.g., `CXX_STANDARD`). -* apply user provided prefix header to unity build target. -* remove effect of `COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES` on generated unity target. -* manual updates. - -## 1.7.2 (2015-04-22) - -* reduce configure time overhead. -* fix bug with dependency checking when using Xcode. -* remove obsolete code required for CMake versions older than 2.8.12. -* streamline debugging output. - -## 1.7.1 (2015-04-06) - -* fix problem with CMake's automatic Qt processing for generated unity targets. -* added a section on common pitfalls when using cotire to the manual. -* remove obsolete code required for CMake versions older than 2.8.12. -* streamline debugging output. -* activate select CMake policies. - -## 1.7.0 (2015-03-29) - -* fix CMake 3.2 compatibility issues. -* cotire now requires CMake 2.8.12 or newer. -* copy `IMPORT_PREFIX` and `IMPORT_SUFFIX` target properties for unity targets (thanks peterhuene). -* new property `COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH` allows for organizing includes - added to the prefix header by priority (thanks ArnaudD-FR). -* for Visual Studio C++, increase static precompiled header memory allocation. -* the default strategy for setting up a unity target's linked libraries is now `COPY_UNITY`. -* for Qt projects, fix problem with handling of `AUTOMOC` in generated unity target. -* fix problem with generating the cotire intermediate directory. -* documentation updates. - -## 1.6.9 (2015-01-18) - -* fix bug with parsing of localized MSVC `/showIncludes` output. - -## 1.6.8 (2014-12-28) - -* fix bug with generation of unity source file segments for parallel builds. - -## 1.6.7 (2014-12-21) - -* fix CMake 3.1 compatibility issues. -* fix ccache 3.2 compatibility issues. -* handle `COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES` correctly for mixed-language targets. -* correctly compute absolute paths of generated source files added to the unity source file. -* fix bug with checking unity source and prefix header dependencies under Xcode. -* fix bug with handling of unity source file dependencies. -* move code to determine build configurations to function of its own. -* documentation updates. - -## 1.6.6 (2014-09-21) - -* fix GCC issue with prefix header generation when source files are missing. -* fix bug where some target properties were not properly propagated to the generated unity target. -* use `target_link_libraries` to set up the unity target link libraries. -* add Qt4 and Qt5 examples to the `Patches` directory. -* documentation updates. - -## 1.6.5 (2014-08-26) - -* correctly handle generator expressions used in compile definitions, compile flags and include - directories (requires CMake 2.8.12 or newer). -* fix `-isystem` includes being incorrectly passed to `execute_process` (thanks nickhutchinson). -* make some error messages more verbose. - -## 1.6.4 (2014-07-14) - -* fix CMake 3.0 compatibility issues. -* preserve system flag for includes when generating PCH (thanks gjasny). -* fix bug with setting up `EXPORTS` symbol for shared libraries. - -## 1.6.3 (2014-06-11) - -* correctly handle usage requirements for transitive link targets. -* use indirect inclusion for prefix header when using generator Xcode. - -## 1.6.2 (2014-06-09) - -* don't use `-w` flag for pre-compiling the prefix header, because it has unwanted side effects. -* correctly handle linked targets' `INTERFACE_COMPILE_OPTIONS`, `INTERFACE_INCLUDE_DIRECTORIES` - and `INTERFACE_COMPILE_DEFINITIONS` properties upon pre-compiling and prefix header generation. -* For Clang and GCC, pre-compile prefix header through indirect inclusion via a prefix source file, - to make both compilers honor the `system_header` pragma in the prefix header correctly. -* fix ccache incompatibility. - -## 1.6.1 (2014-04-20) - -* fixed bug where precompiled headers did not work with Clang (thanks to nh2 for reporting). -* when using ccache, require that environment variable `CCACHE_SLOPPINESS` is set to `time_macros`. - -## 1.6.0 (2014-03-16) - -* suppress compiler warnings from precompiled headers. -* fix Clang compatibility issue with prefix header generation. -* use file extension `.pch` for precompiled headers generated with Clang. -* manual updates. - -## 1.5.2 (2014-01-17) - -* honor framework includes under OS X correctly. -* fix handling of OS X specific variables `CMAKE_OSX_SYSROOT` and `CMAKE_OSX_DEPLOYMENT_TARGET`. -* add new examples to the `Patches` directory. - -## 1.5.1 (2013-11-12) - -* fixed string quoting bugs. - -## 1.5.0 (2013-10-13) - -* CMake 2.8.12 compatibility fixes. -* Upon generation of a unity target, cotire can now be configured to automatically copy all the - linked libraries and targets from the original target. See the section on the new target property - `COTIRE_UNITY_LINK_LIBRARIES_INIT` in the cotire manual. -* fixed bug with copying target properties to generated unity target. -* cotire manual updates. -* add new examples to the `Patches` directory. -* fix typos. - -## 1.4.3 (2013-09-28) - -* fixed bug with generation of unity source file when `COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES` is - set to 0. - -## 1.4.2 (2013-08-24) - -* CMake 2.8.11 compatibility fixes. -* always force the inclusion of a user provided prefix header, even if the target - contains too few sources to enable the use of a precompiled header. - -## 1.4.1 (2013-06-08) - -* fixed bug with determination of compiler version. -* fixed bug with generation of unity source when target source files are used for multiple targets. -* fixed bug with multi-core optimized prefix header generation. - -## 1.4.0 (2013-03-11) - -* one year anniversary release. -* add support for multi-core optimized unity builds for some CMake generators. -* add support for multi-core optimized prefix header generation. -* add more examples to cotire manual. - -## 1.3.6 (2013-03-06) - -* fix bug with prefix header initialization for generator Xcode. -* print cotire version upon inclusion. - -## 1.3.5 (2013-03-01) - -* fix typos in function names and property descriptions. - -## 1.3.4 (2013-02-07) - -* fixed bug with computing to output directory of the generated unity target (thanks shaunew). -* fixed wrong variable reference in debugging output (thanks shaunew). - -## 1.3.3 (2013-02-03) - -* fixed bug with handling of policy CMP0018 relating to target property `POSITION_INDEPENDENT_CODE`. -* fixed warnings relating to uninitialized variables. -* Intel XE 2013 Update 2 compatibility fixes. - -## 1.3.2 (2013-02-02) - -* fixed missing curly brace (thanks shaunew). - -## 1.3.1 (2013-01-29) - -* fix bug with filtering of compile options. - -## 1.3.0 (2013-01-09) - -* add support for Intel C and C++ compilers. -* CMake 2.8.10 compatibility fixes. -* properly clean up generated cotire log files upon invoking `clean` target. -* documentation updates. - -## 1.2.0 (2012-11-01) - -* add support for manually maintained prefix header and unity source files. -* the target property `COTIRE__PREFIX_HEADER_INIT` can be set to a user provided prefix - header file to be used instead of the automatically generated one (e.g., `stdafx.h`). -* the new target property `COTIRE__UNITY_SOURCE_INIT` can be set to a user provided unity - source file to be used instead of the automatically generated one. -* the target property `COTIRE_UNITY_TARGET_NAME` is no longer read-only. It can be set to the - desired name of the unity target that will be added by cotire. -* add parameters `SOURCE_DIR` and `BINARY_DIR` to function `cotire` to allow for explicitly - specifying a target's source and binary directory, if target to be cotired has been added in a - different directory. - -## 1.1.8 (2012-10-27) - -* when using MSVC, apply option `/bigobj` to compilation of generated unity files. - -## 1.1.7 (2012-10-26) - -* cope with double slash characters in scanned include paths. - -## 1.1.6 (2012-09-22) - -* check result code upon scanning includes. -* always add a `clean_cotire` target to easily clean up cotire generated files. -* add section on `extern "C"` linkage issues to manual. - -## 1.1.5 (2012-08-17) - -* new cache variable `COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS` can be set to globally exclude - sources with the listed file extensions from the generated unity source. -* fix check for multi-architecture builds under OS X. - -## 1.1.4 (2012-08-15) - -* prevent redundant re-generation of the unity source, prefix header and precompiled header files - (this makes cotire more applicable to C++ projects that use Qt). - -## 1.1.3 (2012-08-12) - -* fix out of range index operation upon building list of target include directories. -* honor target properties `POSITION_INDEPENDENT_CODE` and `NO_SONAME` introduced with CMake 2.8.9. -* make selection of target source files for requested target language more careful. -* prevent modification of the CMake policy stack upon CMake version check. - -## 1.1.2 (2012-05-06) - -* make handling of include directories more robust against invalid paths. - -## 1.1.1 (2012-04-20) - -* fixed bug with generation of unity targets for `WIN32_EXECUTABLE` targets. -* fixed bug with parsing of localized MSVC `/showIncludes` output. - -## 1.1.0 (2012-04-19) - -* tested with CMake 2.8.8. -* added example to manual that shows how to apply cotire to CMake object library targets. -* fixed multiple bugs with handling of CMake single build type and multiple configuration builds. -* added more robust parsing of localized MSVC `/showIncludes` output. - -## 1.0.9 (2012-04-09) - -* add support for compiler wrappers like ccache. -* under OS X, apply `CMAKE_OSX_SYSROOT` to prefix header include and ignore paths. - -## 1.0.8 (2012-04-05) - -* require CMake 2.8.6 since we are using `set_property` option `APPEND_STRING`. - -## 1.0.7 (2012-04-02) - -* add support for Ninja generator introduced in CMake 2.8.8. -* fix bug with initialization of variable `COTIRE_VERBOSE`. - -## 1.0.6 (2012-04-01) - -* correctly handle builds where both `CMAKE_BUILD_TYPE` and `CMAKE_CONFIGURATION_TYPES` are set. - -## 1.0.5 (2012-03-26) - -* fix Visual Studio C++ 2010 compilation of example project. -* enhance heuristic for #include_next directive detection. -* fix llvm-3.0.src.patch for GCC 4.6 compilation. - -## 1.0.4 (2012-03-24) - -* honor target property INCLUDE_DIRECTORIES introduced in CMake 2.8.8. - -## 1.0.3 (2012-03-23) - -* handle OBJECT_LIBRARY targets introduced in CMake 2.8.8. -* use predefined compiler version variable, if available. - -## 1.0.2 (2012-03-16) - -* fix Xcode 4.3 compatibility. -* Cotire manual corrections. - -## 1.0.1 (2012-03-15) - -* Cotire manual corrections. -* Add prefix header to the generated unity build target. - -## 1.0.0 (2012-03-11) - -* First release. diff --git a/cotire/MANUAL.md b/cotire/MANUAL.md deleted file mode 100644 index c522eec6c..000000000 --- a/cotire/MANUAL.md +++ /dev/null @@ -1,791 +0,0 @@ -cotire manual -============= - -Cotire (compile time reducer) is a CMake module that speeds up the build process of CMake based -build systems by fully automating techniques as [precompiled header][pch] usage and -[single compilation unit][scu] builds for C and C++. - -motivation ----------- - -Cotire was born out of a dissatisfaction with the existing CMake solutions for adding -[precompiled header][1260] support and unity build support to CMake based build systems. -The design of cotire tries to adhere to the following principles: - -#### as automatic as possible - -[Precompiled header][pch] and [unity builds][scu] are good ideas in principle, but in reality -they do not work if the burden of maintaining the required additional source files (a -[prefix header][pfh] and a unity source file) is put on the developer. A modern build system -like CMake provides enough context information to have the build system generate and update -these files automatically. - -#### non-intrusive - -The configuration of precompiled headers usage and single computation unit builds belongs to the -build system and not in the source code. Nobody wants to litter one's source files with `hdrstop` -pragmas or be forced to add an include directive to every file. Source code should build properly -when a precompiled header isn't used and should build faster when a precompiled header is used. - -#### minimal interface - -Maintaining a build system over time is enough work and the CMake language may often get in your -way. Thus the solution should only add few public CMake functions. It should be easy to integrate -it into an existing CMake based build system and it should be just as easy to remove it again. - -#### lazy file creation - -The additional source files needed for precompiled header support and unity build support should -only be created when they are required for the compilation of a target. Thus the solution should -not create these files upon configuring the project, but should set up custom build commands for -the creation of these files that only kick in when the files are required to exist by the build -process. - -#### cross-platform - -C/C++ Compilers and IDEs on different platforms vary widely in how the implement precompiled -header support. The solution should hide these implementation details and present a uniform -interface to the developer on all supported platforms. - -cotire basic usage ------------------- - -Cotire consists of a single CMake module file, which can be easily added to an existing CMake -project. - -The file `CMake/cotire.cmake` needs to be copied to the module directory of a CMake project. In the -top-level `CMakeList.txt` file, the module directory needs to be added to the CMake module search -path: - - set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") - -To use cotire in a CMake project, one adds the following include directive to the beginning of the -top-level `CMakeList.txt`: - - include(cotire) - -To speed the build process of a CMake library or executable target, the `cotire` function is -applied to a CMake target. From the example project that ships with cotire: - - add_executable(example main.cpp example.cpp log.cpp log.h example.h) - ... - cotire(example) - -Cotire looks at the properties of the target provided by CMake (e.g., target type, source files, -compile flags, preprocessor defines, include directories, ...) and modifies the target's build -process in the following way: - -1. cotire adds a custom build rule to produce a unity source file from the target's sources. -2. cotire adds a custom build rule to produce a prefix header file by tracking the header files - included by the target's sources. -3. cotire adds a custom build rule to produce a precompiled header from the prefix header. -4. cotire modifies the target's compile flags to make use of the generated precompiled header. -5. cotire adds a couple of new targets. - -For makefile based build systems, running `make help` in the terminal reveals the new targets: - - $ make help - ... - ... all_pch - ... all_unity - ... clean_cotire - ... example - ... example_pch - ... example_unity - -The `example_pch` target triggers the compilation of the precompiled header and as a side effect -the generation of the unity source and the prefix header. The target `clean_cotire` cleans up all -files generated by cotire. The `example_unity` target produces the same output as the original -`example` target, but does so by performing a unity build. The `all_pch` and `all_unity` serve as -pool targets for all cotired project targets. - -By default, the `example_unity` target inherits all build settings from the original target -`example` including linked libraries and target dependencies. - -cotire generated files ----------------------- - -For a target that has been cotired, three files will be generated as part of the build process: - -### the unity source - -The unity source file is generated from the target by querying the target's `SOURCES` property. -It consists of preprocessor include directives for each of the target source files. The files -are included in the same order that is used in the CMake `add_executable` or `add_library` call. -Header files are omitted. - -This is a unity source generated for the example project under OS X: - - #ifdef __cplusplus - #include "/Users/sakra/Documents/cotire/src/main.cpp" - #include "/Users/sakra/Documents/cotire/src/example.cpp" - #include "/Users/sakra/Documents/cotire/src/log.cpp" - #endif - -The unity source file uses absolute paths to include the target's source file. The file is not -intended to be portable across different build folders or machines. It is an intermediate file -tied to the build folder that is automatically recreated by the build system if it is missing. - -For multi-core machines cotire can be configured to generate multiple unity file segments that -can be built in parallel by the chosen CMake generator (see below). - -### the prefix header - -The prefix header is produced from the unity source file by running the unity file through the -preprocessor and keeping track of each header file used (this is done by using option `-H` with -GCC / Clang and `/showIncludes` with Visual Studio C++). The path of each used header file is -compared against an exclude directory list and an include directory list to decide if the header -file should be added to the prefix header. - -By default the include directory list is empty and the exclude directory list is initialized to -`"${CMAKE_SOURCE_DIR};${CMAKE_BINARY_DIR}"`. This default setting guarantees that project headers -which are likely to be changed frequently are not added to the prefix header. - -Upon generation of the prefix header cotire makes sure that target compile options, include path -settings and preprocessor defines (e.g., `NDEBUG`) that affect the outcome of the preprocessor -are correctly set up. - -Generating the prefix header from the unity source is much faster than running each individual -target source file through the preprocessor, because the coalesced unity source will make the -preprocessor process most header files only once. - -This is a prefix header produced for the example project with Visual Studio 2013 under Windows 7: - - #pragma warning(push, 0) - #ifdef __cplusplus - #include "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\string" - #include "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\algorithm" - #include "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\iostream" - #endif - #pragma warning(pop) - -Generating the prefix file under Ubuntu 12.04 with GCC 4.6 yields the following result: - - #pragma GCC system_header - #ifdef __cplusplus - #include "/usr/include/c++/4.6/string" - #include "/usr/include/c++/4.6/algorithm" - #include "/usr/include/c++/4.6/iterator" - #include "/usr/include/c++/4.6/iostream" - #endif - -Using Xcode 5.1 under OS X 10.9, this is the resulting prefix header: - - #pragma clang system_header - #ifdef __cplusplus - #include "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/string" - #include "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/iostream" - #endif - -Besides include directives, cotire also adds compiler specific pragmas to the generated prefix -header to suppress compiler warnings upon inclusion. - -Cotire attempts to produce a minimal list of header files by omitting header files indirectly -included by a header that is already part of the prefix header. Header files with nonstandard -file extensions like `.inl`, `.inc` of `.ipp` are omitted by default. - -The generated prefix file includes the selected header files by their absolute paths. This speeds -up the precompiling of the prefix header because the compiler does not have to search for header -files in include directories again. - -The prefix header is tailored to the CMake target that it is generated for. It is tied to the -compiler environment of the local machine and is not portable across different compilers or -machines. It is automatically recreated by the build system if it goes missing. - -The generated prefix header can be applied to a different target added in the same source directory -(see below). - -Optionally, cotire will also create a prefix source file that consists of a single include directive -for the prefix header. This file is needed for pre-compiling the prefix header with Clang or GCC -to make both compilers handle the `system_header` pragma correctly. - -### the precompiled header - -The precompiled header is produced from the generated prefix header by using the proprietary -precompiling mechanism depending on the compiler used. For GCC and Clang cotire sets up a custom -build rule and generates the precompiled header as described in the documentation for -[GCC][gcc_pch] and [Clang][clang_pch]. Cotire then modifies the `COMPILE_FLAGS` property of the -target to force the inclusion of the prefix header. - -Visual Studio C++ and Intel C++ use a [different approach][msvc_pch] to pre-compiling. Both -compilers require a host source file to generate the precompiled header as a side effect of -producing an object file. Cotire modifies the `COMPILE_FLAGS` of the first target source file to -[generate][msvc_pch_create] the precompiled header and then modifies the `COMPILE_FLAGS` of the -remaining target source files to [include][msvc_pch_use] the generated precompiled header. - -For Xcode projects generated with CMake, cotire completely hands off the pre-compilation of -the prefix header and the inclusion of the precompiled header to the IDE. Cotire attaches a -pre-build action to the target which generates the unity source file and the prefix header. -Cotire then modifies Xcode attributes of the generated Xcode project to have Xcode precompile the -the generated prefix header with the Xcode build steps `ProcessPCH` for C sources and -`ProcessPCH++` for C++ sources. - -For precompiled headers creation flags must match use flags exactly. Cotire uses the same flags, -include directories and preprocessor defines that are used for the compilation of source files -for the generation of the precompiled header. Thus the resulting precompiled header binary is only -usable for the target and cannot be re-used for a different CMake target. - -cotire advanced usage ---------------------- - -### applying cotire to multiple targets at the same time - -The `cotire` function can be applied to multiple targets added in the same source directory in one -call: - - add_library(libA STATIC ...) - add_library(libB SHARED ...) - add_executable(example ...) - ... - cotire(example libA libB) - -### mixed-language targets - -Cotire is able to speed up the build process of mixed language targets, consisting of both C and -C++ sources. It generates a separate set of unity source files, prefix headers and precompiled -headers for both languages and modifies the `COMPILE_FLAGS` of each target source file to include -the correct precompiled header depending on the compilation language of the source file. - -### obtaining the names of the generated files and targets - -For a cotired target the target properties `COTIRE__UNITY_SOURCE`, -`COTIRE__PREFIX_HEADER`, `COTIRE__PRECOMPILED_HEADER` will be set to the paths of the -generated files (`` can be set to `CXX` or `C`). The target property -`COTIRE_UNITY_TARGET_NAME` will be set to the name of the generated unity target: - - cotire(example) - ... - get_target_property(_unitySource example COTIRE_CXX_UNITY_SOURCE) - get_target_property(_prefixHeader example COTIRE_CXX_PREFIX_HEADER) - get_target_property(_precompiledHeader example COTIRE_CXX_PRECOMPILED_HEADER) - get_target_property(_unityTargetName example COTIRE_UNITY_TARGET_NAME) - -If a source file's `COMPILE_FLAGS` are modified by cotire, it sets the source file property -`COTIRE_TARGET` to the name of the target, that the source file's build command has been -altered for: - - cotire(example) - ... - get_source_file_property(_cotireTargetName "example.cpp" COTIRE_TARGET) - if (_cotireTargetName) - message(STATUS "example.cpp has been cotired for target ${_cotireTargetName}") - endif() - -### changing the name of the generated unity build target - -By default cotire uses the name of the the original target with the suffix `_unity` appended -for the name of the generated unity build target. To create the unity build target under a -different name, set the `COTIRE_UNITY_TARGET_NAME` property: - - add_executable(example_template main.cpp example.cpp log.cpp log.h example.h) - set_target_properties(example_template PROPERTIES COTIRE_UNITY_TARGET_NAME "example") - ... - cotire(example_template) - -Invoking the `example` target will then run the unity build. - -### restricting cotire to certain build configurations - -To restrict the cotire related modifications to the build process to certain build configurations, -the `CONFIGURATIONS` parameter can be added to the `cotire` call. - - cotire(example CONFIGURATIONS Release MinSizeRel) - -For single build type builds the selected configuration will be checked at configure time, for -multi-configuration builds the check will be done at build time. - -It is recommended to have at least one build configuration that does not make use of cotire to -ensure that the project builds properly without cotire. - -### disabling precompiled headers and unity builds - -If the target's build process should not be modified to make use of the generated precompiled -header, the target property `COTIRE_ENABLE_PRECOMPILED_HEADER` can be set to `FALSE`: - - set_target_properties(example PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE) - cotire(example) - -If a unity build target should not be added by cotire, the target property -`COTIRE_ADD_UNITY_BUILD` can be set to `FALSE`: - - set_target_properties(example PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE) - cotire(example) - -The property `COTIRE_ADD_UNITY_BUILD` only affects the addition of the unity build target. Custom -build rules for the generation of the unity source file will always be set up, because the -unity source file is needed for the generation of the prefix header. - -Both properties default to `TRUE`. If both are set to `FALSE`, cotire will only set up custom build -rules for the generation of the unity source and the prefix header. - -The properties `COTIRE_ENABLE_PRECOMPILED_HEADER` and `COTIRE_ADD_UNITY_BUILD` can also be set on -directories. A target inherits the property value from its enclosing directory. - -### disabling precompiled headers for small targets - -The cache variable `COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES` can be set to the minimum number of -source files required to enable the use of a precompiled header. It defaults to 2. To override the -default, run `cmake` with the following options: - - $ cmake -D COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=5 - -### using a manually maintained prefix header instead of the automatically generated one - -cotire can be configured to use an existing manually maintained prefix header (e.g., Visual Studio -projects often use a prefix header named `stdafx.h`) instead of the automatically generated one. -Set the target property `COTIRE_CXX_PREFIX_HEADER_INIT` to the path of the existing prefix header -file. The path is interpreted relative to the target source directory: - - set_target_properties(example PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdafx.h") - cotire(example) - -If the prefix header `stdafx.h` needs an accompanying source file (e.g., `stdafx.cpp`) in order -to be precompiled properly, that source file needs to be the first one on the list of source -files in the target's `add_executable` or `add_library` call. - -The property `COTIRE_CXX_PREFIX_HEADER_INIT` can also be set to a list of header files which will -then make up the contents of the generated prefix header. - -A manually maintained prefix header will always be applied to the corresponding target, -even if the target contains too few sources to enable the use of a precompiled header. - -### using a generated prefix header for multiple targets - -A prefix header that is generated for a cotired target can be applied to a different target -added in the same source directory: - - cotire(example) - get_target_property(_prefixHeader example COTIRE_CXX_PREFIX_HEADER) - ... - set_target_properties(other_target PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${_prefixHeader}") - cotire(other_target) - -The compilation of either target will trigger the generation of the prefix header. - -### configuring the generation of the prefix header - -There are multiple target properties which affect the generation of the prefix header: - -* `COTIRE_PREFIX_HEADER_IGNORE_PATH` can be set to a semicolon separated list of directories. If a -header file is found in one of these directories or sub-directories, it will be excluded from the -generated prefix header. - -* `COTIRE_PREFIX_HEADER_INCLUDE_PATH` can be set to a semicolon separated list of directories. If -a header file is included from one of these directories or sub-directories, it will be included -in the generated prefix header. - -If a header file is matched by both `COTIRE_PREFIX_HEADER_IGNORE_PATH` and -`COTIRE_PREFIX_HEADER_INCLUDE_PATH`, the option which yields the closer relative path match wins. -For example, if third-party libraries are part of the source tree in a directory called `Libs`, -the following setting will make cotire select header files from the third-party directory, but -ignore other project related headers in `CMAKE_SOURCE_DIR`: - - set_target_properties(example PROPERTIES - COTIRE_PREFIX_HEADER_IGNORE_PATH "${CMAKE_SOURCE_DIR}" - COTIRE_PREFIX_HEADER_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/Libs") - -The properties `COTIRE_PREFIX_HEADER_IGNORE_PATH` and `COTIRE_PREFIX_HEADER_INCLUDE_PATH` can -also be set on directories. - -The following cache variables also affect the selection of prefix headers: - -* Directory paths in `COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH` will be added to the list of -ignored directories when the prefix header file is created. - -* `COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS` can be used to ignore header files by file -extension. It defaults to the CMake list `inc;inl;ipp`. - -During development, changes to the project source files may affect the list of header files that -should be selected for inclusion in the prefix header (e.g., a standard include may be added or -removed from a target source file). Cotire does not automatically recreate the prefix header, -when a target source file is changed, because this would always trigger a re-compilation of the -precompiled header and would result in a rebuild of the whole target. To make the prefix header -creation dependent on changes to certain target source files, the source file property -`COTIRE_DEPENDENCY` can be set to `TRUE` for those files: - - set_property (SOURCE "example.cpp" PROPERTY COTIRE_DEPENDENCY "TRUE") - -### fixing linkage issues - -When a C++ program uses `extern "C"` on a system header file, cotire will not be able to detect -that the include file needs C linkage and will include the file with C++ linkage in the generated -prefix header instead. For example, the C interface to BLAS `cblas.h` usually has to be included -as `extern "C"` in a C++ program: - - extern "C" { - #include - } - -The presence of `extern "C"` includes will prevent cotired targets from being linked successfully -because of unresolved function references using the wrong linkage. To work around the problem, -the property `COTIRE_PREFIX_HEADER_IGNORE_PATH` can also include the full path of header files -besides directories. Here is an example: - - set_property(DIRECTORY - PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH - "${ATLAS_INCLUDE_DIR}/cblas.h" - "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}") - -That way `cblas.h` will not be included in the generated prefix header and will not cause problems -upon linking. - -### using a manually maintained unity source instead of the automatically generated one - -Cotire can be configured to use an existing manually maintained unity source file instead of the -automatically generated one. Set the target property `COTIRE_CXX_UNITY_SOURCE_INIT` to the path -of the existing unity source file. Its path is interpreted relative to the target source directory: - - set_target_properties(example PROPERTIES COTIRE_CXX_UNITY_SOURCE_INIT "example-all.cpp") - cotire(example) - -The property can also be set to a list of source files which will then make up the contents of -the generated unity source file. - -### configuring the generation of the unity source - -By default cotire adds all target source files to the generated unity source. In most cases a -unity build will not work out of the box, because unity builds [break][EoUB] the use of some C -and C++ language features. Unity build problems can be tackled in the following way: - -* Change the order of the source files in the `add_executable` or `add_library` calls. -Problematic source files should be moved towards the end. - -* Set the source file property `COTIRE_EXCLUDED` on problematic source files. The source file -will not be included in the unity source file and will be compiled separately when the unity build -is performed. - -* `COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS` can be used to exclude source files by file extension -from inclusion in the generated unity source. It defaults to the CMake list `m;mm`. - -* If the unity source file is too large and the compilation process runs into a compiler limit, -the target property `COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES` can be set. If the target -contains more than that number of source files, cotire will create multiple unity source files -for it. Each unity source file is compiled separately when the unity build is performed. -The property is initialized by value of the cache variable -`COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES`. - -* Another way to break up a large unity source file is to set the source file property -`COTIRE_START_NEW_UNITY_SOURCE` to `TRUE` on selected target source files. If cotire encounters -this property, it will complete the current unity file and start a new one. The new unity source -file will include the source file as the first one. This property essentially works as a separator -for unity source files. - -### optimizing the build process for multiple processor cores - -To make use of all the machine's CPU cores for the unity compilation of a target, the target -property `COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES` can be set to the string `-j`. Cotire -will then create as many unity file segments as there are CPU cores on the machine. Because -the unity file segments do not depend on each other, a multi-core aware build process can compile -the file segments in parallel. - -To explicitly specify the number of cores, append the number after `-j`, e.g. `-j 4` or `-j4`. - -For CMake generators that are multi-core aware by default (i.e., Visual Studio, JOM, Ninja), cotire -will automatically initialize the property to `-j`. For makefile based generators, this has to be -done explicitly by setting the cache variable `COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES`, i.e.: - - $ cmake -D COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES=-j4 - $ make -j 4 - -### fixing macro definition clashes - -Many unity build problems stem from macro definitions leaking into other target source files, -where they may conflict with other definitions of the same name. Cotire adds the properties -`COTIRE_UNITY_SOURCE_PRE_UNDEFS` and `COTIRE_UNITY_SOURCE_POST_UNDEFS` to fix macro definition -clashes. - -As an example, if these properties are set on a source file of the example project: - - set_source_files_properties (example.cpp PROPERTIES - COTIRE_UNITY_SOURCE_PRE_UNDEFS "max;min" - COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") - -This will make cotire add undefs to the generated unity source file. - - #ifdef __cplusplus - #include "/Users/sakra/Documents/cotire/src/main.cpp" - #undef min - #undef max - #include "/Users/sakra/Documents/cotire/src/example.cpp" - #undef DEBUG_TYPE - #include "/Users/sakra/Documents/cotire/src/log.cpp" - #endif - -The properties `COTIRE_UNITY_SOURCE_PRE_UNDEFS` and `COTIRE_UNITY_SOURCE_POST_UNDEFS` can also be -set on targets. Cotire will add `#undef` directives for each source file in the unity source then. - -### enabling verbose builds - -The cache variable `COTIRE_VERBOSE` can be set to `TRUE` to see all compile commands used when -generating the cotire related files. Cotire will also print the contents of the generated unity -source and the prefix header for verbose builds. `COTIRE_VERBOSE` defaults to `FALSE`. -When using a Makefile generator `COTIRE_VERBOSE` defaults to the value of the makefile variable -`VERBOSE` (i.e., `make VERBOSE=1`). - -### conditionally loading cotire - -To make a `CMakeLists.txt` robust against a missing `cotire.cmake` module, the following strategy -can be applied to using cotire: - - include(cotire OPTIONAL) - ... - add_executable(example main.cpp example.cpp log.cpp log.h example.h) - ... - if (COMMAND cotire) - cotire(example) - endif() - -The `include(cotire OPTIONAL)` will prevent CMake from raising an error if cotire cannot be -found. The actual calls to cotire need to be guarded by `if (COMMAND cotire)` blocks. - -### using cotire with compiler wrappers - -Cotire is compatible with CMake compiler wrappers. For example, the use of [ccache][ccch] may be -enabled in the following way upon configuring the project: - - $ export CC="/usr/local/bin/ccache /usr/bin/gcc" - $ export CXX="/usr/local/bin/ccache /usr/bin/g++" - $ export CCACHE_SLOPPINESS=pch_defines,time_macros - $ cmake .. - -Alternatively, for CMake 3.4 or later compiler wrappers can be enabled by pointing the CMake -variable `CMAKE_CXX_COMPILER_LAUNCHER` to the compiler wrapper executable upon configuring: - - $ cmake -D CMAKE_CXX_COMPILER_LAUNCHER=/usr/local/bin/ccache - -Note that with ccache in order for precompiled headers to work properly, it is necessary to set -the environment variable `CCACHE_SLOPPINESS` to `pch_defines,time_macros`. Otherwise the build -process may abort with the following error message: - - fatal error: file 'example_CXX_prefix.hxx' has been modified since the precompiled header - 'example_CXX_prefix.hxx.gch' was built - -Also see the [ccache manual][ccch_pch]. - -### applying cotire to object library targets - -CMake 2.8.8 introduced a new type of library target called [object library][objlib]. An object -library is a convenience target that compiles multiple source files but does not create a linked -target library for them, e.g.: - - add_library(myLib OBJECT lib1.cpp lib2.cpp lib3.cpp) - add_executable(exeA $ mainA.cpp) - add_executable(exeB $ mainB.cpp) - -The `cotire` function can be applied to an object library target in a familiar fashion: - - add_library(myLib OBJECT lib1.cpp lib2.cpp lib3.cpp) - cotire(myLib) - # use unity object library for executables - add_executable(exeA $ mainA.cpp) - add_executable(exeB $ mainB.cpp) - -Because object library targets do not support `PRE_BUILD` actions, precompiled header usage cannot -be enabled for them for Xcode projects generated with CMake. Unity builds work as expected, though. - -### automatically setting up linked libraries in the unity target - -The setting of the target property `COTIRE_UNITY_LINK_LIBRARIES_INIT` controls the linking -strategy for the generated unit target. - -If this property is empty or set to `NONE`, the generated unity target's link libraries have to be -set up manually with subsequent `target_link_libraries` calls: - - set_target_properties(example PROPERTIES COTIRE_UNITY_LINK_LIBRARIES_INIT "NONE") - ... - cotire(example) - target_link_libraries(MyExecutable_unity ${MyExecutableLibraries}) - -If this property is set to `COPY`, the unity target's link libraries will be copied from the -original target. - -If this property is set to `COPY_UNITY`, the unity target's link libraries will be copied from the -original target but instead of copying a linked target verbatim, the target's corresponding unity -target will be preferred, provided one exists. This also applies to object libraries, which have -been added to the original target with a `TARGET_OBJECTS` generator expression. - -As of cotire 1.7.0, the default linking strategy for unit targets is `COPY_UNITY`. - -The property `COTIRE_UNITY_LINK_LIBRARIES_INIT` can also be set on directories. A target inherits -the property value from its enclosing directory. To make all targets in the project use the -`COPY` strategy, the directory property can be set in the outermost `CMakeList.txt` file: - - include(cotire) - ... - set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY") - -### using cotire with Qt - -Cotire is compatible with both Qt projects that use CMake as build system, provided Qt targets -do not use CMake automatic moc, uid or rcc scanning. - -### installing files generated by unity targets - -Cotire cannot set up a `install_unity` target that mimics the `install` target automatically, -because CMake does not provide the necessary information about the existing install rules -programmatically. - -When using a Makefile generator, you can use the following workaround (thanks to peterhuene): - - $ make all_unity - $ make install/fast - -The `install/fast` does not trigger a build, but will use the binaries built by the `all_unity` -target. - -For other generators, set up an `install_unity` target manually. First set up install rules for -all unity targets, that mimic the install rules for the original targets: - - install(TARGETS example_unity RUNTIME DESTINATION "bin" OPTIONAL COMPONENT "unity") - -This installs the `example` executable built by the unity target to the `bin` folder. The install -rules for unity targets must use a custom install component. Then add a global `install_unity` -target that performs the installation of all unity targets: - - add_custom_target(install_unity - COMMAND ${CMAKE_COMMAND} -DCOMPONENT=unity -P cmake_install.cmake - COMMENT "Install the unity-built project..." - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) - add_dependencies(unity_install example_unity) - -The global `install_unity` target must depend on all unity targets that should be installed. - -### customized inclusion of system headers - -If a system header ends up in a precompiled header, it is not possible to customize the inclusion -of that header in a source file through preprocessor defines. - -For example, under Windows one may want to include `Windows.h` with `NOMINMAX` defined to prevent -the definition of the `min` and `max` macros: - - #define NOMINMAX - #include - -The dependency of `Windows.h` on the preprocessor define `NOMINMAX` will not be picked up by cotire -automatically upon adding `Windows.h` to the prefix header. To work around the problem, make the -dependency explicit by using `add_definitions` in the corresponding `CMakeLists.txt`: - - if (WIN32) - # prevent definition of min and max macros through inclusion of Windows.h - add_definitions("-DNOMINMAX") - endif() - -That way, the preprocessor define `NOMINMAX` will be picked up by cotire and applied to the -pre-compilation of the prefix header. - -### organize includes added to the prefix header - -Sometimes the order of the includes in the automatically generated prefix header may result in -compilation errors due to subtile header dependencies. - -To work around the problem, the target property `COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH` -can be set to a list of directories. Header files whose path matches one of these directories will -be inserted at the beginning of generated prefix header. Header files are sorted according to -the order of the directories in the property. Headers not matching one of these directories are -left untouched. - -The property `COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH` can also be set on directories. A target -inherits the property value from its enclosing directory. - -common pitfalls ---------------- - -### include the `cotire.cmake` module correctly - -If CMake issues the message `Unknown CMake command "cotire"`, double check that the cotire module -has been included correctly in your project. See the manual section "cotire basic usage". - -### do not modify a target's build related properties after applying cotire - -Cotire only considers build related settings of a target at the time of the `cotire` function call. -If target properties that control the build are changed after the call to the `cotire` function, -the build rules set up by cotire for the precompiled header and unity build may not work correctly. - -Don't do this: - - add_executable(example main.cpp example.cpp log.cpp log.h example.h) - cotire(example) - ... - set_target_properties(example PROPERTIES POSITION_INDEPENDENT_CODE ON) # affects build - - -### always apply cotire in the same source directory where a target has been added - -CMake targets are globally visible. Nevertheless, it is important that the `cotire` function is -called for a target in the exact same directory that creates the target with `add_library` or -`add_executable`. - -Don't do this: - - add_subdirectory(src) - ... - cotire(mytarget) # mytarget added in src directory - -Cotire may fail to inspect the target's source files correctly, if the target has been added in a -different directory and you may get odd messages about missing source files. - -known issues ------------- - -### generator expressions - -cotire uses the CMake command `file(GENERATE ...` to expand generator expressions used in various -compilation settings. This command does not handle certain CMake generator expressions like -`$` correctly. - -### Ninja compatibility - -Under Ninja indirect prefix header dependencies are ignored by the generated build system. Cotire -uses the `IMPLICIT_DEPENDS` option of `add_custom_command` to make the precompiled header depend -on header files indirectly included by the prefix header. The `IMPLICIT_DEPENDS` option is not -supported by CMake's Ninja generator. See [CMake issue][ninja_issue]. - -### using source files for multiple targets - -When the same set of source files is used for different targets (e.g., for producing a static -and a shared library variant from the same sources), using a precompiled header may not work. -Under certain circumstances, cotire cannot enable the precompiled header usage by changing the -`COMPILE_FLAGS` property of the whole target, but must set the `COMPILE_FLAGS` properties of -individual target source files instead. This will break the usage of the source file for multiple -targets. - -### multi-architecture builds under Mac OS X - -Neither GCC nor Clang support the use of precompiled headers when performing a Mac OS X -multi-architecture build (e.g., using option `-DCMAKE_OSX_ARCHITECTURES=i386;x86_64`). - -### Objective-C - -CMake targets that contain Objective-C or Objective-C++ source files cannot be cotired. Source -files ending with .m and .mm are excluded by default through the initial default setting of -`COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS`. - -### Intel C++ - -Intel C++ support has only been tested with [Intel C++ Composer XE 2013 for Linux][icc_linux] and -may not work with other platforms or versions. - -The Intel compiler may issue incorrect warnings #672 (the command line options do not match those -used when precompiled header was created) or #673 (the initial sequence of preprocessing directives -is not compatible with those of precompiled header file) upon compilation of cotired targets. - -### IncrediBuild - -Cotire is not compatible with [Xoreax IncrediBuild][XGE]. - -[1260]:https://cmake.org/Bug/view.php?id=1260 -[ccch]:https://ccache.samba.org/ -[ccch_pch]:https://ccache.samba.org/manual.html#_precompiled_headers -[clang_pch]:https://clang.llvm.org/docs/UsersManual.html#precompiled-headers -[gcc_pch]:https://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html -[msvc_pch]:https://msdn.microsoft.com/en-us/library/szfdksca(v=vs.90).aspx -[msvc_pch_create]:https://msdn.microsoft.com/en-us/library/7zc28563(v=vs.90).aspx -[msvc_pch_use]:https://msdn.microsoft.com/en-us/library/z0atkd6c(v=vs.90).aspx -[ninja_issue]:https://cmake.org/Bug/view.php?id=13234 -[EoUB]:http://altdevblog.com/2011/08/14/the-evils-of-unity-builds/ -[pch]:https://en.wikipedia.org/wiki/Precompiled_header -[scu]:https://en.wikipedia.org/wiki/Single_Compilation_Unit -[objlib]:https://cmake.org/cmake/help/latest/command/add_library.html#object-libraries -[pfh]:https://en.wikipedia.org/wiki/Prefix_header -[icc_linux]:https://software.intel.com/en-us/c-compilers/ipsxe-support -[XGE]:https://www.incredibuild.com/ diff --git a/cotire/Patches/OpenCV-2.3.1.patch b/cotire/Patches/OpenCV-2.3.1.patch deleted file mode 100644 index 43fc141ca..000000000 --- a/cotire/Patches/OpenCV-2.3.1.patch +++ /dev/null @@ -1,299 +0,0 @@ -diff -rupN OpenCV-2.3.1/3rdparty/libjasper/CMakeLists.txt OpenCV-2.3.1.cotire/3rdparty/libjasper/CMakeLists.txt ---- OpenCV-2.3.1/3rdparty/libjasper/CMakeLists.txt 2011-09-12 20:39:55.000000000 +0200 -+++ OpenCV-2.3.1.cotire/3rdparty/libjasper/CMakeLists.txt 2012-04-01 11:23:04.000000000 +0200 -@@ -56,3 +56,7 @@ if(NOT BUILD_SHARED_LIBS) - install(TARGETS ${the_target} - ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main) - endif() -+ -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() -diff -rupN OpenCV-2.3.1/3rdparty/libjpeg/CMakeLists.txt OpenCV-2.3.1.cotire/3rdparty/libjpeg/CMakeLists.txt ---- OpenCV-2.3.1/3rdparty/libjpeg/CMakeLists.txt 2011-09-12 20:40:15.000000000 +0200 -+++ OpenCV-2.3.1.cotire/3rdparty/libjpeg/CMakeLists.txt 2012-04-01 11:23:10.000000000 +0200 -@@ -48,3 +48,7 @@ if(NOT BUILD_SHARED_LIBS) - install(TARGETS ${the_target} - ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main) - endif() -+ -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() -diff -rupN OpenCV-2.3.1/3rdparty/libpng/CMakeLists.txt OpenCV-2.3.1.cotire/3rdparty/libpng/CMakeLists.txt ---- OpenCV-2.3.1/3rdparty/libpng/CMakeLists.txt 2011-09-12 20:40:02.000000000 +0200 -+++ OpenCV-2.3.1.cotire/3rdparty/libpng/CMakeLists.txt 2012-04-01 11:23:17.000000000 +0200 -@@ -49,3 +49,7 @@ if(NOT BUILD_SHARED_LIBS) - install(TARGETS ${the_target} - ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main) - endif() -+ -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() -diff -rupN OpenCV-2.3.1/3rdparty/libtiff/CMakeLists.txt OpenCV-2.3.1.cotire/3rdparty/libtiff/CMakeLists.txt ---- OpenCV-2.3.1/3rdparty/libtiff/CMakeLists.txt 2011-09-12 20:29:15.000000000 +0200 -+++ OpenCV-2.3.1.cotire/3rdparty/libtiff/CMakeLists.txt 2012-04-01 11:23:23.000000000 +0200 -@@ -103,3 +103,7 @@ if(NOT BUILD_SHARED_LIBS) - install(TARGETS ${the_target} - ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main) - endif() -+ -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() -diff -rupN OpenCV-2.3.1/3rdparty/zlib/CMakeLists.txt OpenCV-2.3.1.cotire/3rdparty/zlib/CMakeLists.txt ---- OpenCV-2.3.1/3rdparty/zlib/CMakeLists.txt 2011-09-12 20:29:21.000000000 +0200 -+++ OpenCV-2.3.1.cotire/3rdparty/zlib/CMakeLists.txt 2012-04-01 11:24:36.000000000 +0200 -@@ -40,3 +40,7 @@ if(NOT BUILD_SHARED_LIBS) - install(TARGETS ${the_target} - ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main) - endif() -+ -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() -diff -rupN OpenCV-2.3.1/CMakeLists.txt OpenCV-2.3.1.cotire/CMakeLists.txt ---- OpenCV-2.3.1/CMakeLists.txt 2011-09-12 20:45:38.000000000 +0200 -+++ OpenCV-2.3.1.cotire/CMakeLists.txt 2012-04-01 14:34:56.000000000 +0200 -@@ -39,6 +39,8 @@ endif(NOT CMAKE_TOOLCHAIN_FILE) - cmake_minimum_required(VERSION 2.4) - project(OpenCV) - -+include("${CMAKE_SOURCE_DIR}/cotire.cmake") -+ - set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE) - if(DEFINED CMAKE_BUILD_TYPE) - set_property( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} ) -diff -rupN OpenCV-2.3.1/OpenCVModule.cmake OpenCV-2.3.1.cotire/OpenCVModule.cmake ---- OpenCV-2.3.1/OpenCVModule.cmake 2011-09-12 20:45:38.000000000 +0200 -+++ OpenCV-2.3.1.cotire/OpenCVModule.cmake 2012-04-01 11:26:16.000000000 +0200 -@@ -86,7 +86,7 @@ macro(define_opencv_module name) - INSTALL_NAME_DIR lib - ) - -- add_opencv_precompiled_headers(${the_target}) -+# add_opencv_precompiled_headers(${the_target}) - - # Add the required libraries for linking: - target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN}) -@@ -102,6 +102,10 @@ macro(define_opencv_module name) - ) - endif() - -+ if (COMMAND cotire) -+ cotire(${the_target}) -+ endif() -+ - # Dependencies of this target: - add_dependencies(${the_target} ${ARGN}) - -@@ -137,7 +141,7 @@ macro(define_opencv_module name) - - add_executable(${the_target} ${test_srcs} ${test_hdrs}) - -- add_opencv_precompiled_headers(${the_target}) -+# add_opencv_precompiled_headers(${the_target}) - - # Additional target properties - set_target_properties(${the_target} PROPERTIES -@@ -149,6 +153,10 @@ macro(define_opencv_module name) - set_target_properties(${the_target} PROPERTIES FOLDER "tests") - endif() - -+ if (COMMAND cotire) -+ cotire(${the_target}) -+ endif() -+ - add_dependencies(${the_target} ${test_deps}) - - # Add the required libraries for linking: -diff -rupN OpenCV-2.3.1/modules/androidcamera/CMakeLists.txt OpenCV-2.3.1.cotire/modules/androidcamera/CMakeLists.txt ---- OpenCV-2.3.1/modules/androidcamera/CMakeLists.txt 2011-09-12 20:42:03.000000000 +0200 -+++ OpenCV-2.3.1.cotire/modules/androidcamera/CMakeLists.txt 2012-04-01 11:28:54.000000000 +0200 -@@ -52,3 +52,7 @@ if (NOT BUILD_ANDROID_CAMERA_WRAPPER) - COMPONENT main) - endforeach() - endif() -+ -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() -diff -rupN OpenCV-2.3.1/modules/androidcamera/camera_wrapper/CMakeLists.txt OpenCV-2.3.1.cotire/modules/androidcamera/camera_wrapper/CMakeLists.txt ---- OpenCV-2.3.1/modules/androidcamera/camera_wrapper/CMakeLists.txt 2011-09-12 20:42:03.000000000 +0200 -+++ OpenCV-2.3.1.cotire/modules/androidcamera/camera_wrapper/CMakeLists.txt 2012-04-01 11:20:26.000000000 +0200 -@@ -34,3 +34,7 @@ SET_TARGET_PROPERTIES(${the_target} PROP - ) - - install(TARGETS ${the_target} LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main) -+ -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() -diff -rupN OpenCV-2.3.1/modules/gpu/CMakeLists.txt OpenCV-2.3.1.cotire/modules/gpu/CMakeLists.txt ---- OpenCV-2.3.1/modules/gpu/CMakeLists.txt 2011-09-12 20:42:20.000000000 +0200 -+++ OpenCV-2.3.1.cotire/modules/gpu/CMakeLists.txt 2012-04-01 11:41:04.000000000 +0200 -@@ -106,7 +106,7 @@ if (BUILD_SHARED_LIBS) - endif() - endif() - --add_opencv_precompiled_headers(${the_target}) -+#add_opencv_precompiled_headers(${the_target}) - - # Additional target properties - set_target_properties(${the_target} PROPERTIES -@@ -156,6 +156,9 @@ install(FILES src/nvidia/NPP_staging/NPP - # DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name}/device - # COMPONENT main) - -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() - - ################################################################################################################ - ################################ GPU Module Tests ##################################################### -@@ -192,14 +195,17 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURREN - - add_executable(${the_test_target} ${test_srcs} ${test_hdrs} ${nvidia}) - -- add_opencv_precompiled_headers(${the_test_target}) -+# add_opencv_precompiled_headers(${the_test_target}) - - # Additional target properties - set_target_properties(${the_test_target} PROPERTIES - DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" - RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}" - ) -- -+ if (COMMAND cotire) -+ cotire(${the_test_target}) -+ endif() -+ - if(ENABLE_SOLUTION_FOLDERS) - set_target_properties(${the_test_target} PROPERTIES FOLDER "tests") - endif() -diff -rupN OpenCV-2.3.1/modules/haartraining/CMakeLists.txt OpenCV-2.3.1.cotire/modules/haartraining/CMakeLists.txt ---- OpenCV-2.3.1/modules/haartraining/CMakeLists.txt 2011-09-12 20:43:56.000000000 +0200 -+++ OpenCV-2.3.1.cotire/modules/haartraining/CMakeLists.txt 2012-04-01 11:21:27.000000000 +0200 -@@ -45,6 +45,10 @@ set_target_properties(opencv_haartrainin - INSTALL_NAME_DIR lib - ) - -+if (COMMAND cotire) -+cotire(opencv_haartraining_engine) -+endif() -+ - if(NOT ANDROID) - # ----------------------------------------------------------- - # haartraining -diff -rupN OpenCV-2.3.1/modules/highgui/CMakeLists.txt OpenCV-2.3.1.cotire/modules/highgui/CMakeLists.txt ---- OpenCV-2.3.1/modules/highgui/CMakeLists.txt 2011-09-12 20:41:29.000000000 +0200 -+++ OpenCV-2.3.1.cotire/modules/highgui/CMakeLists.txt 2012-04-01 12:17:12.000000000 +0200 -@@ -77,6 +77,10 @@ file(GLOB grfmt_srcs src/grfmt*.cpp) - set(grfmt_hdrs src/bitstrm.hpp ${grfmt_hdrs}) - set(grfmt_srcs src/bitstrm.cpp ${grfmt_srcs}) - -+if (COMMAND cotire) -+ set_source_files_properties (${grfmt_srcs} PROPERTIES COTIRE_EXCLUDED TRUE) -+endif() -+ - source_group("Src\\grfmts" FILES ${grfmt_hdrs} ${grfmt_srcs}) - - set(highgui_srcs -@@ -209,6 +213,9 @@ if(APPLE) - else() - set(highgui_srcs ${highgui_srcs} src/cap_qtkit.mm) - endif() -+ if (COMMAND cotire) -+ set_source_files_properties (src/window_cocoa.mm src/cap_qtkit.mm PROPERTIES COTIRE_EXCLUDED TRUE) -+ endif() - endif(APPLE) - - if(WITH_ANDROID_CAMERA) -@@ -276,7 +283,7 @@ if (BUILD_SHARED_LIBS) - endif() - endif() - --add_opencv_precompiled_headers(${the_target}) -+#add_opencv_precompiled_headers(${the_target}) - - # For dynamic link numbering convenions - if(NOT ANDROID) -@@ -307,6 +314,10 @@ if(MSVC) - set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG") - endif(MSVC) - -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() -+ - # Dependencies of this target: - add_dependencies(${the_target} opencv_core opencv_imgproc) - -@@ -397,7 +408,7 @@ if(BUILD_TESTS) - - add_executable(${the_target} ${test_srcs} ${test_hdrs}) - -- add_opencv_precompiled_headers(${the_target}) -+# add_opencv_precompiled_headers(${the_target}) - - # Additional target properties - set_target_properties(${the_target} PROPERTIES -@@ -409,6 +420,10 @@ if(BUILD_TESTS) - set_target_properties(${the_target} PROPERTIES FOLDER "tests") - endif() - -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() -+ - add_dependencies(${the_target} ${test_deps}) - - # Add the required libraries for linking: -diff -rupN OpenCV-2.3.1/modules/java/CMakeLists.txt OpenCV-2.3.1.cotire/modules/java/CMakeLists.txt ---- OpenCV-2.3.1/modules/java/CMakeLists.txt 2011-09-12 20:40:26.000000000 +0200 -+++ OpenCV-2.3.1.cotire/modules/java/CMakeLists.txt 2012-04-01 11:22:49.000000000 +0200 -@@ -163,6 +163,10 @@ set_target_properties(${target} PROPERTI - - install(TARGETS ${target} LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main) - -+if (COMMAND cotire) -+cotire(${target}) -+endif() -+ - if(ANDROID) - target_link_libraries(${target} jnigraphics) - -diff -rupN OpenCV-2.3.1/modules/python/CMakeLists.txt OpenCV-2.3.1.cotire/modules/python/CMakeLists.txt ---- OpenCV-2.3.1/modules/python/CMakeLists.txt 2011-09-12 20:40:30.000000000 +0200 -+++ OpenCV-2.3.1.cotire/modules/python/CMakeLists.txt 2012-04-01 11:23:51.000000000 +0200 -@@ -92,3 +92,7 @@ install(TARGETS ${cvpymodules} - ARCHIVE DESTINATION ${CVPY_PATH} COMPONENT main - ) - install(FILES src2/cv.py DESTINATION ${CVPY_PATH} COMPONENT main) -+ -+if (COMMAND cotire) -+cotire(${cv2_target}) -+endif() -diff -rupN OpenCV-2.3.1/modules/stitching/CMakeLists.txt OpenCV-2.3.1.cotire/modules/stitching/CMakeLists.txt ---- OpenCV-2.3.1/modules/stitching/CMakeLists.txt 2011-09-12 20:42:22.000000000 +0200 -+++ OpenCV-2.3.1.cotire/modules/stitching/CMakeLists.txt 2012-04-01 11:24:09.000000000 +0200 -@@ -38,3 +38,7 @@ endif() - target_link_libraries(${the_target} ${stitching_libs}) - - install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main) -+ -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() -diff -rupN OpenCV-2.3.1/modules/traincascade/CMakeLists.txt OpenCV-2.3.1.cotire/modules/traincascade/CMakeLists.txt ---- OpenCV-2.3.1/modules/traincascade/CMakeLists.txt 2011-09-12 20:40:17.000000000 +0200 -+++ OpenCV-2.3.1.cotire/modules/traincascade/CMakeLists.txt 2012-04-01 11:24:25.000000000 +0200 -@@ -44,3 +44,7 @@ target_link_libraries(${the_target} ${tr - if(NOT ANDROID) - install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main) - endif() -+ -+if (COMMAND cotire) -+cotire(${the_target}) -+endif() diff --git a/cotire/Patches/README.md b/cotire/Patches/README.md deleted file mode 100644 index 54f1736e2..000000000 --- a/cotire/Patches/README.md +++ /dev/null @@ -1,24 +0,0 @@ -This directory contains patch files to enable cotire for some popular open sources packages that -use CMake as a build system. - -For example, to apply Cotire to LLVM 3.0, first copy `cotire.cmake` to a directory on the CMake -module search path (e.g., `llvm-3.0.src/cmake/modules`). - -Then apply the corresponding patch: - - $ cd /path/to/llvm-3.0.src - $ patch -p1 < /path/to/llvm-3.0.src.patch - -Then proceed with an out-of-source CMake build: - - $ mkdir build; cd build - $ cmake .. - -- The C compiler identification is GNU 4.2.1 - -- The CXX compiler identification is Clang 3.1.0 - ... - $ make - [ 0%] Generating C unity source lib/Support/cotire/LLVMSupport_C_unity.c - [ 0%] Generating CXX unity source lib/Support/cotire/LLVMSupport_CXX_unity.cxx - [ 0%] Generating CXX prefix header lib/Support/cotire/LLVMSupport_CXX_prefix.hxx - [ 0%] Building CXX precompiled header lib/Support/cotire/LLVMSupport_CXX_prefix.hxx.gch - ... diff --git a/cotire/Patches/bullet-2.80-rev2531.patch b/cotire/Patches/bullet-2.80-rev2531.patch deleted file mode 100644 index ac5a2172b..000000000 --- a/cotire/Patches/bullet-2.80-rev2531.patch +++ /dev/null @@ -1,389 +0,0 @@ -diff -rupN bullet-2.80-rev2531/CMakeLists.txt bullet-2.80-rev2531.cotire/CMakeLists.txt ---- bullet-2.80-rev2531/CMakeLists.txt 2012-03-03 04:15:04.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/CMakeLists.txt 2012-03-24 20:40:40.000000000 +0100 -@@ -11,6 +11,7 @@ IF(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) - ENDIF(COMMAND cmake_policy) - -+include("${CMAKE_SOURCE_DIR}/cotire.cmake") - - IF (NOT CMAKE_BUILD_TYPE) - # SET(CMAKE_BUILD_TYPE "Debug") -diff -rupN bullet-2.80-rev2531/Demos/OpenGL/CMakeLists.txt bullet-2.80-rev2531.cotire/Demos/OpenGL/CMakeLists.txt ---- bullet-2.80-rev2531/Demos/OpenGL/CMakeLists.txt 2011-09-13 03:52:42.000000000 +0200 -+++ bullet-2.80-rev2531.cotire/Demos/OpenGL/CMakeLists.txt 2012-03-24 20:35:19.000000000 +0100 -@@ -65,3 +65,7 @@ IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (INSTALL_EXTRA_LIBS) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) -+ -+if (COMMAND cotire) -+ cotire(OpenGLSupport) -+endif() -diff -rupN bullet-2.80-rev2531/Extras/ConvexDecomposition/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/ConvexDecomposition/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/ConvexDecomposition/CMakeLists.txt 2010-09-18 02:24:50.000000000 +0200 -+++ bullet-2.80-rev2531.cotire/Extras/ConvexDecomposition/CMakeLists.txt 2012-03-24 20:35:36.000000000 +0100 -@@ -62,3 +62,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - ENDIF (INSTALL_EXTRA_LIBS) -+ -+if (COMMAND cotire) -+ cotire(ConvexDecomposition) -+endif() -diff -rupN bullet-2.80-rev2531/Extras/GIMPACTUtils/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/GIMPACTUtils/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/GIMPACTUtils/CMakeLists.txt 2010-09-18 02:24:50.000000000 +0200 -+++ bullet-2.80-rev2531.cotire/Extras/GIMPACTUtils/CMakeLists.txt 2012-03-24 20:35:42.000000000 +0100 -@@ -35,3 +35,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - ENDIF (INSTALL_EXTRA_LIBS) -+ -+if (COMMAND cotire) -+ cotire(GIMPACTUtils) -+endif() -diff -rupN bullet-2.80-rev2531/Extras/HACD/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/HACD/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/HACD/CMakeLists.txt 2011-07-07 02:28:15.000000000 +0200 -+++ bullet-2.80-rev2531.cotire/Extras/HACD/CMakeLists.txt 2012-03-24 20:36:03.000000000 +0100 -@@ -49,3 +49,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - - ENDIF (INSTALL_EXTRA_LIBS) - -+ - -+if (COMMAND cotire) - -+ cotire(HACD) - -+endif() - -diff -rupN bullet-2.80-rev2531/Extras/PhysicsEffects/src/base_level/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/base_level/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/PhysicsEffects/src/base_level/CMakeLists.txt 2012-03-05 05:59:58.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/base_level/CMakeLists.txt 2012-03-24 20:36:29.000000000 +0100 -@@ -75,3 +75,7 @@ ADD_LIBRARY(PfxBaseLevel ${PfxBaseLevel_ - - - SET_TARGET_PROPERTIES(PfxBaseLevel PROPERTIES VERSION ${BULLET_VERSION}) - - SET_TARGET_PROPERTIES(PfxBaseLevel PROPERTIES SOVERSION ${BULLET_VERSION}) - -+ - -+if (COMMAND cotire) - -+ cotire(PfxBaseLevel) - -+endif() - -diff -rupN bullet-2.80-rev2531/Extras/PhysicsEffects/src/low_level/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/low_level/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/PhysicsEffects/src/low_level/CMakeLists.txt 2012-03-05 05:59:58.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/low_level/CMakeLists.txt 2012-03-24 20:36:39.000000000 +0100 -@@ -27,3 +27,7 @@ ADD_LIBRARY(PfxLowLevel ${PfxLowLevel_SR - - - SET_TARGET_PROPERTIES(PfxLowLevel PROPERTIES VERSION ${BULLET_VERSION}) - - SET_TARGET_PROPERTIES(PfxLowLevel PROPERTIES SOVERSION ${BULLET_VERSION}) - -+ - -+if (COMMAND cotire) - -+ cotire(PfxLowLevel) - -+endif() - -diff -rupN bullet-2.80-rev2531/Extras/PhysicsEffects/src/util/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/util/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/PhysicsEffects/src/util/CMakeLists.txt 2012-03-05 05:59:58.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/util/CMakeLists.txt 2012-03-24 20:36:47.000000000 +0100 -@@ -18,3 +18,7 @@ ADD_LIBRARY(PfxUtil ${PfxUtil_SRCS} ${Pf - - - SET_TARGET_PROPERTIES(PfxUtil PROPERTIES VERSION ${BULLET_VERSION}) - - SET_TARGET_PROPERTIES(PfxUtil PROPERTIES SOVERSION ${BULLET_VERSION}) - -+ - -+if (COMMAND cotire) - -+ cotire(PfxUtil) - -+endif() - -diff -rupN bullet-2.80-rev2531/Extras/Serialize/BlenderSerialize/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/Serialize/BlenderSerialize/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/Serialize/BlenderSerialize/CMakeLists.txt 2010-03-06 16:23:36.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/Extras/Serialize/BlenderSerialize/CMakeLists.txt 2012-03-24 20:36:55.000000000 +0100 -@@ -5,3 +5,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Seri - ) - - ADD_LIBRARY(BlenderSerialize dna249.cpp dna249-64bit.cpp bBlenderFile.cpp bBlenderFile.h bMain.cpp bMain.h ) -+ -+if (COMMAND cotire) -+ cotire(BlenderSerialize) -+endif() -diff -rupN bullet-2.80-rev2531/Extras/Serialize/BulletFileLoader/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/Serialize/BulletFileLoader/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/Serialize/BulletFileLoader/CMakeLists.txt 2012-02-29 05:43:51.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/Extras/Serialize/BulletFileLoader/CMakeLists.txt 2012-03-24 20:37:05.000000000 +0100 -@@ -47,3 +47,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - ENDIF (INSTALL_EXTRA_LIBS) -+ -+if (COMMAND cotire) -+ cotire(BulletFileLoader) -+endif() -diff -rupN bullet-2.80-rev2531/Extras/Serialize/BulletWorldImporter/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/Serialize/BulletWorldImporter/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/Serialize/BulletWorldImporter/CMakeLists.txt 2012-02-29 05:43:51.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/Extras/Serialize/BulletWorldImporter/CMakeLists.txt 2012-03-24 20:37:15.000000000 +0100 -@@ -36,3 +36,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - ENDIF (INSTALL_EXTRA_LIBS) -+ -+if (COMMAND cotire) -+ cotire(BulletWorldImporter) -+endif() -diff -rupN bullet-2.80-rev2531/Extras/Serialize/makesdna/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/Serialize/makesdna/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/Serialize/makesdna/CMakeLists.txt 2010-03-06 16:23:36.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/Extras/Serialize/makesdna/CMakeLists.txt 2012-03-24 20:37:26.000000000 +0100 -@@ -35,3 +35,7 @@ SET(SRC ${BULLET_PHYSICS_SOURCE_DIR}/sr - ADD_LIBRARY(BulletDNA ${SRC} ${INC_FILES}) - - MESSAGE(STATUS "Configuring makesdna") -+ -+if (COMMAND cotire) -+ cotire(BulletDNA) -+endif() -diff -rupN bullet-2.80-rev2531/Extras/glui/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/glui/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/glui/CMakeLists.txt 2010-03-06 16:23:36.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/Extras/glui/CMakeLists.txt 2012-03-24 20:35:51.000000000 +0100 -@@ -64,3 +64,7 @@ arcball.cpp glui_button.cpp glui_fil - IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(GLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) - ENDIF (BUILD_SHARED_LIBS) -+ -+if (COMMAND cotire) -+ cotire(GLUI) -+endif() -diff -rupN bullet-2.80-rev2531/Extras/iff/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/iff/CMakeLists.txt ---- bullet-2.80-rev2531/Extras/iff/CMakeLists.txt 2010-03-06 16:23:36.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/Extras/iff/CMakeLists.txt 2012-03-24 20:36:12.000000000 +0100 -@@ -9,3 +9,7 @@ iffw.cpp - ) - - #SUBDIRS( BulletIffConverter ) -+ -+if (COMMAND cotire) -+ cotire(Iff) -+endif() -diff -rupN bullet-2.80-rev2531/UnitTests/cppunit/CMakeLists.txt bullet-2.80-rev2531.cotire/UnitTests/cppunit/CMakeLists.txt ---- bullet-2.80-rev2531/UnitTests/cppunit/CMakeLists.txt 2010-07-24 00:09:57.000000000 +0200 -+++ bullet-2.80-rev2531.cotire/UnitTests/cppunit/CMakeLists.txt 2012-03-24 20:39:51.000000000 +0100 -@@ -71,4 +71,8 @@ ADD_LIBRARY(cppunit - - src/cppunit/XmlDocument.cpp - - src/cppunit/XmlElement.cpp - - - --) -\ No newline at end of file -+) - -+ - -+if (COMMAND cotire) - -+ cotire(cppunit) - -+endif() - -diff -rupN bullet-2.80-rev2531/src/BulletCollision/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletCollision/CMakeLists.txt ---- bullet-2.80-rev2531/src/BulletCollision/CMakeLists.txt 2012-02-29 06:19:22.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/BulletCollision/CMakeLists.txt 2012-03-24 20:37:38.000000000 +0100 -@@ -277,3 +277,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/Bulle - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - ENDIF (INSTALL_LIBS) -+ -+if (COMMAND cotire) -+ cotire(BulletCollision) -+endif() -diff -rupN bullet-2.80-rev2531/src/BulletDynamics/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletDynamics/CMakeLists.txt ---- bullet-2.80-rev2531/src/BulletDynamics/CMakeLists.txt 2011-09-15 20:47:13.000000000 +0200 -+++ bullet-2.80-rev2531.cotire/src/BulletDynamics/CMakeLists.txt 2012-03-24 20:43:34.000000000 +0100 -@@ -110,3 +110,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/Bulle - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - ENDIF (INSTALL_LIBS) -+ -+if (COMMAND cotire) -+ cotire(BulletDynamics) -+endif() -diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/CMakeLists.txt ---- bullet-2.80-rev2531/src/BulletMultiThreaded/CMakeLists.txt 2012-02-29 06:19:22.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/CMakeLists.txt 2012-03-24 20:37:58.000000000 +0100 -@@ -121,3 +121,6 @@ PATTERN "*.h" PATTERN ".svn" EXCLUDE PA - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - ENDIF (INSTALL_LIBS) - -+if (COMMAND cotire) -+ cotire(BulletMultiThreaded) -+endif() -diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt ---- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt 2011-11-11 20:00:26.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt 2012-03-24 20:38:09.000000000 +0100 -@@ -81,3 +81,7 @@ IF (INSTALL_LIBS) - - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - - ENDIF (INSTALL_LIBS) - -+ - -+if (COMMAND cotire) - -+ cotire(BulletSoftBodySolvers_DX11) - -+endif() - -diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt ---- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt 2011-12-20 19:03:24.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt 2012-03-24 20:38:22.000000000 +0100 -@@ -60,3 +60,7 @@ IF (INSTALL_LIBS) - - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - - ENDIF (INSTALL_LIBS) - -+ - -+if (COMMAND cotire) - -+ cotire(BulletSoftBodySolvers_OpenCL_AMD) - -+endif() - -diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt ---- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt 2011-11-11 20:00:26.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt 2012-03-24 20:38:38.000000000 +0100 -@@ -75,3 +75,7 @@ IF (INSTALL_LIBS) - - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - - ENDIF (INSTALL_LIBS) - -+ - -+if (COMMAND cotire) - -+ cotire(BulletSoftBodySolvers_OpenCL_Apple) - -+endif() - -diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt ---- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt 2011-12-20 19:03:24.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt 2012-03-24 20:38:51.000000000 +0100 -@@ -80,3 +80,7 @@ IF (INSTALL_LIBS) - - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - - ENDIF (INSTALL_LIBS) - -+ - -+if (COMMAND cotire) - -+ cotire(BulletSoftBodySolvers_OpenCL_Intel) - -+endif() - -diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt ---- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt 2011-11-11 20:00:26.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt 2012-03-24 20:39:00.000000000 +0100 -@@ -73,3 +73,7 @@ IF (INSTALL_LIBS) - - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - - ENDIF (INSTALL_LIBS) - -+ - -+if (COMMAND cotire) - -+ cotire(BulletSoftBodySolvers_OpenCL_Mini) - -+endif() - -diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt ---- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt 2011-12-20 19:03:24.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt 2012-03-24 20:39:08.000000000 +0100 -@@ -79,3 +79,7 @@ IF (INSTALL_LIBS) - - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - - ENDIF (INSTALL_LIBS) - -+ - -+if (COMMAND cotire) - -+ cotire(BulletSoftBodySolvers_OpenCL_NVidia) - -+endif() - -diff -rupN bullet-2.80-rev2531/src/BulletSoftBody/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletSoftBody/CMakeLists.txt ---- bullet-2.80-rev2531/src/BulletSoftBody/CMakeLists.txt 2010-12-01 06:55:08.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/BulletSoftBody/CMakeLists.txt 2012-03-24 20:39:20.000000000 +0100 -@@ -63,3 +63,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - ENDIF (INSTALL_LIBS) -+ -+if (COMMAND cotire) -+ cotire(BulletSoftBody) -+endif() -diff -rupN bullet-2.80-rev2531/src/LinearMath/CMakeLists.txt bullet-2.80-rev2531.cotire/src/LinearMath/CMakeLists.txt ---- bullet-2.80-rev2531/src/LinearMath/CMakeLists.txt 2011-11-11 21:11:03.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/LinearMath/CMakeLists.txt 2012-03-24 20:39:28.000000000 +0100 -@@ -64,3 +64,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - ENDIF (INSTALL_LIBS) -+ -+if (COMMAND cotire) -+ cotire(LinearMath) -+endif() -diff -rupN bullet-2.80-rev2531/src/MiniCL/CMakeLists.txt bullet-2.80-rev2531.cotire/src/MiniCL/CMakeLists.txt ---- bullet-2.80-rev2531/src/MiniCL/CMakeLists.txt 2012-02-29 06:19:22.000000000 +0100 -+++ bullet-2.80-rev2531.cotire/src/MiniCL/CMakeLists.txt 2012-03-24 20:39:38.000000000 +0100 -@@ -64,3 +64,6 @@ PATTERN "*.h" PATTERN ".svn" EXCLUDE PA - ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) - - ENDIF (INSTALL_LIBS) - - - -+if (COMMAND cotire) - -+ cotire(MiniCL) - -+endif() - diff --git a/cotire/Patches/clang-3.0.src.patch b/cotire/Patches/clang-3.0.src.patch deleted file mode 100644 index 9a4d5bee4..000000000 --- a/cotire/Patches/clang-3.0.src.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -rupN clang-3.0.src/CMakeLists.txt clang-3.0.src.cotire/CMakeLists.txt ---- clang-3.0.src/CMakeLists.txt 2011-10-06 15:03:08.000000000 +0200 -+++ clang-3.0.src.cotire/CMakeLists.txt 2012-03-24 14:04:10.000000000 +0100 -@@ -36,6 +36,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR - include(TableGen) - include("${CLANG_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake") - include(HandleLLVMOptions) -+ include(cotire) - - set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") - -@@ -206,6 +207,11 @@ macro(add_clang_library name) - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) - set_target_properties(${name} PROPERTIES FOLDER "Clang libraries") -+ if (COMMAND cotire) -+ if (NOT "${name}" MATCHES "libclang") -+ cotire(${name}) -+ endif() -+ endif() - endmacro(add_clang_library) - - macro(add_clang_executable name) -diff -rupN clang-3.0.src/tools/libclang/CMakeLists.txt clang-3.0.src.cotire/tools/libclang/CMakeLists.txt ---- clang-3.0.src/tools/libclang/CMakeLists.txt 2011-10-06 09:00:54.000000000 +0200 -+++ clang-3.0.src.cotire/tools/libclang/CMakeLists.txt 2012-03-24 14:05:02.000000000 +0100 -@@ -70,3 +70,8 @@ if( NOT BUILD_SHARED_LIBS AND NOT WIN32 - PROPERTIES - OUTPUT_NAME "libclang") - endif() -+ -+if (COMMAND cotire) -+ cotire(libclang) -+ cotire(${LIBCLANG_STATIC_TARGET_NAME}) -+endif() diff --git a/cotire/Patches/clang-3.1.src.patch b/cotire/Patches/clang-3.1.src.patch deleted file mode 100644 index 55ab88ba7..000000000 --- a/cotire/Patches/clang-3.1.src.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -rupN clang-3.1.src/CMakeLists.txt clang-3.1.src.cotire/CMakeLists.txt ---- clang-3.1.src/CMakeLists.txt 2012-04-16 06:16:43.000000000 +0200 -+++ clang-3.1.src.cotire/CMakeLists.txt 2012-05-23 19:34:06.000000000 +0200 -@@ -36,6 +36,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR - include(TableGen) - include("${CLANG_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake") - include(HandleLLVMOptions) -+ include(cotire) - - set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") - -@@ -211,6 +212,11 @@ macro(add_clang_library name) - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} - RUNTIME DESTINATION bin) - set_target_properties(${name} PROPERTIES FOLDER "Clang libraries") -+ if (COMMAND cotire) -+ if (NOT "${name}" MATCHES "libclang") -+ cotire(${name}) -+ endif() -+ endif() - endmacro(add_clang_library) - - macro(add_clang_executable name) -diff -rupN clang-3.1.src/tools/libclang/CMakeLists.txt clang-3.1.src.cotire/tools/libclang/CMakeLists.txt ---- clang-3.1.src/tools/libclang/CMakeLists.txt 2012-04-13 19:26:32.000000000 +0200 -+++ clang-3.1.src.cotire/tools/libclang/CMakeLists.txt 2012-05-23 19:34:06.000000000 +0200 -@@ -88,3 +88,8 @@ if( NOT BUILD_SHARED_LIBS AND NOT WIN32 - PROPERTIES - OUTPUT_NAME "libclang") - endif() -+ -+if (COMMAND cotire) -+ cotire(libclang) -+ cotire(${LIBCLANG_STATIC_TARGET_NAME}) -+endif() diff --git a/cotire/Patches/clang-3.3.src.patch b/cotire/Patches/clang-3.3.src.patch deleted file mode 100644 index bbfc83dee..000000000 --- a/cotire/Patches/clang-3.3.src.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -rupN cfe-3.3.src/CMakeLists.txt cfe-3.3.src.cotire/CMakeLists.txt ---- cfe-3.3.src/CMakeLists.txt 2013-04-22 16:51:21.000000000 +0200 -+++ cfe-3.3.src.cotire/CMakeLists.txt 2013-10-13 12:02:05.000000000 +0200 -@@ -2,7 +2,7 @@ - # standalone project, using LLVM as an external library: - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) - project(Clang) -- cmake_minimum_required(VERSION 2.8) -+ cmake_minimum_required(VERSION 2.8.11) - - set(CLANG_PATH_TO_LLVM_SOURCE "" CACHE PATH - "Path to LLVM source code. Not necessary if using an installed LLVM.") -@@ -36,6 +36,8 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR - include(TableGen) - include("${CLANG_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake") - include(HandleLLVMOptions) -+ include(cotire) -+ set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY") - - set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") - -@@ -234,6 +236,12 @@ macro(add_clang_library name) - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} - RUNTIME DESTINATION bin) - set_target_properties(${name} PROPERTIES FOLDER "Clang libraries") -+ if (COMMAND cotire) -+ if (NOT "${name}" MATCHES "libclang") -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+ endif() -+ endif() - endmacro(add_clang_library) - - macro(add_clang_executable name) -diff -rupN cfe-3.3.src/tools/libclang/CMakeLists.txt cfe-3.3.src.cotire/tools/libclang/CMakeLists.txt ---- cfe-3.3.src/tools/libclang/CMakeLists.txt 2013-03-29 22:51:40.000000000 +0100 -+++ cfe-3.3.src.cotire/tools/libclang/CMakeLists.txt 2013-10-13 11:32:48.000000000 +0200 -@@ -114,3 +114,8 @@ if( NOT BUILD_SHARED_LIBS AND NOT WIN32 - PROPERTIES - OUTPUT_NAME "clang") - endif() -+ -+if (COMMAND cotire) -+ cotire(libclang) -+ cotire(${LIBCLANG_STATIC_TARGET_NAME}) -+endif() diff --git a/cotire/Patches/clang-3.4.src.patch b/cotire/Patches/clang-3.4.src.patch deleted file mode 100644 index 9e092e843..000000000 --- a/cotire/Patches/clang-3.4.src.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -rupN clang-3.4.src/CMakeLists.txt clang-3.4.src.cotire/CMakeLists.txt ---- clang-3.4.src/CMakeLists.txt 2013-11-06 09:37:50.000000000 +0100 -+++ clang-3.4.src.cotire/CMakeLists.txt 2014-01-17 20:33:42.000000000 +0100 -@@ -2,7 +2,7 @@ - # standalone project, using LLVM as an external library: - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) - project(Clang) -- cmake_minimum_required(VERSION 2.8) -+ cmake_minimum_required(VERSION 2.8.11) - - set(CLANG_PATH_TO_LLVM_SOURCE "" CACHE PATH - "Path to LLVM source code. Not necessary if using an installed LLVM.") -@@ -40,6 +40,8 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR - include(TableGen) - include("${CLANG_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake") - include(HandleLLVMOptions) -+ include(cotire) -+ set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY") - - set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") - -@@ -286,6 +288,12 @@ macro(add_clang_library name) - endif() - - set_target_properties(${name} PROPERTIES FOLDER "Clang libraries") -+ if (COMMAND cotire) -+ if (NOT "${name}" MATCHES "libclang") -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+ endif() -+ endif() - endmacro(add_clang_library) - - macro(add_clang_executable name) -diff -rupN clang-3.4.src/tools/libclang/CMakeLists.txt clang-3.4.src.cotire/tools/libclang/CMakeLists.txt ---- clang-3.4.src/tools/libclang/CMakeLists.txt 2013-11-13 23:26:04.000000000 +0100 -+++ clang-3.4.src.cotire/tools/libclang/CMakeLists.txt 2014-01-17 20:37:53.000000000 +0100 -@@ -124,3 +124,10 @@ if( (NOT LLVM_ENABLE_PIC OR LIBCLANG_BUI - PROPERTIES - OUTPUT_NAME "clang") - endif() -+ -+if (COMMAND cotire) -+ cotire(libclang) -+ if (TARGET ${LIBCLANG_STATIC_TARGET_NAME}) -+ cotire(${LIBCLANG_STATIC_TARGET_NAME}) -+ endif() -+endif() diff --git a/cotire/Patches/clang-3.5.src.patch b/cotire/Patches/clang-3.5.src.patch deleted file mode 100644 index 0d9c44492..000000000 --- a/cotire/Patches/clang-3.5.src.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -rupN --exclude=.DS_Store cfe-3.5.0.src/CMakeLists.txt cfe-3.5.0.src.cotire/CMakeLists.txt ---- cfe-3.5.0.src/CMakeLists.txt 2014-07-16 18:48:33.000000000 +0200 -+++ cfe-3.5.0.src.cotire/CMakeLists.txt 2014-12-21 19:58:36.000000000 +0100 -@@ -94,6 +94,8 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR - include(AddLLVM) - include(TableGen) - include(HandleLLVMOptions) -+ include(cotire) -+ set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY") - - set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") - -@@ -343,6 +345,12 @@ macro(add_clang_library name) - endif() - - set_target_properties(${name} PROPERTIES FOLDER "Clang libraries") -+ if (COMMAND cotire) -+ if (NOT "${name}" MATCHES "libclang") -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+ endif() -+ endif() - endmacro(add_clang_library) - - macro(add_clang_executable name) -diff -rupN --exclude=.DS_Store cfe-3.5.0.src/tools/libclang/CMakeLists.txt cfe-3.5.0.src.cotire/tools/libclang/CMakeLists.txt ---- cfe-3.5.0.src/tools/libclang/CMakeLists.txt 2014-07-15 00:17:16.000000000 +0200 -+++ cfe-3.5.0.src.cotire/tools/libclang/CMakeLists.txt 2014-12-21 19:58:36.000000000 +0100 -@@ -114,3 +114,10 @@ if(ENABLE_SHARED) - LINK_FLAGS ${LIBCLANG_LINK_FLAGS}) - endif() - endif() -+ -+if (COMMAND cotire) -+ cotire(libclang) -+ if (TARGET ${LIBCLANG_STATIC_TARGET_NAME}) -+ cotire(${LIBCLANG_STATIC_TARGET_NAME}) -+ endif() -+endif() diff --git a/cotire/Patches/clapack-3.2.1-CMAKE.patch b/cotire/Patches/clapack-3.2.1-CMAKE.patch deleted file mode 100644 index 61dfafed8..000000000 --- a/cotire/Patches/clapack-3.2.1-CMAKE.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -rupN clapack-3.2.1-CMAKE/BLAS/SRC/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/BLAS/SRC/CMakeLists.txt ---- clapack-3.2.1-CMAKE/BLAS/SRC/CMakeLists.txt 2009-08-14 22:16:25.000000000 +0200 -+++ clapack-3.2.1-CMAKE.cotire/BLAS/SRC/CMakeLists.txt 2012-03-24 19:59:26.000000000 +0100 -@@ -141,3 +141,13 @@ if(UNIX) - target_link_libraries(blas m) - endif() - target_link_libraries(blas f2c) -+ -+if (COMMAND cotire) -+ cotire(blas) -+ if (TARGET blas_unity) -+ if(UNIX) -+ target_link_libraries(blas_unity m) -+ endif() -+ target_link_libraries(blas_unity f2c_unity) -+ endif() -+endif() -diff -rupN clapack-3.2.1-CMAKE/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/CMakeLists.txt ---- clapack-3.2.1-CMAKE/CMakeLists.txt 2009-08-10 20:46:33.000000000 +0200 -+++ clapack-3.2.1-CMAKE.cotire/CMakeLists.txt 2012-03-24 19:56:58.000000000 +0100 -@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6) - project(CLAPACK C) - enable_testing() - include(CTest) -+include("${CMAKE_SOURCE_DIR}/cotire.cmake") - - if(WIN32 AND NOT CYGWIN) - set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c) -diff -rupN clapack-3.2.1-CMAKE/F2CLIBS/libf2c/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/F2CLIBS/libf2c/CMakeLists.txt ---- clapack-3.2.1-CMAKE/F2CLIBS/libf2c/CMakeLists.txt 2009-08-10 20:06:06.000000000 +0200 -+++ clapack-3.2.1-CMAKE.cotire/F2CLIBS/libf2c/CMakeLists.txt 2012-03-24 19:58:41.000000000 +0100 -@@ -60,3 +60,6 @@ include_directories(${CLAPACK_SOURCE_DIR - include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c) - add_library(f2c ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h) - set_property(TARGET f2c PROPERTY PREFIX lib) -+if (COMMAND cotire) -+ cotire(f2c) -+endif() -diff -rupN clapack-3.2.1-CMAKE/SRC/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/SRC/CMakeLists.txt ---- clapack-3.2.1-CMAKE/SRC/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200 -+++ clapack-3.2.1-CMAKE.cotire/SRC/CMakeLists.txt 2012-03-24 19:59:20.000000000 +0100 -@@ -378,3 +378,9 @@ endif() - add_library(lapack ${ALLOBJ} ${ALLXOBJ}) - target_link_libraries(lapack blas) - -+if (COMMAND cotire) -+ cotire(lapack) -+ if (TARGET lapack_unity) -+ target_link_libraries(lapack_unity blas_unity) -+ endif() -+endif() -diff -rupN clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/TESTING/EIG/CMakeLists.txt ---- clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200 -+++ clapack-3.2.1-CMAKE.cotire/TESTING/EIG/CMakeLists.txt 2012-03-24 20:07:55.000000000 +0100 -@@ -120,6 +120,12 @@ set(ZEIGTST zchkee.c - macro(add_eig_executable name ) - add_executable(${name} ${ARGN}) - target_link_libraries(${name} tmglib lapack ) -+ if (COMMAND cotire) -+ cotire(${name}) -+ if (TARGET ${name}_unity) -+ target_link_libraries(${name}_unity tmglib lapack ) -+ endif() -+ endif() - endmacro(add_eig_executable) - - add_eig_executable(xeigtsts ${SEIGTST} ${SCIGTST} ${AEIGTST} -diff -rupN clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/TESTING/LIN/CMakeLists.txt ---- clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt 2009-08-10 20:06:06.000000000 +0200 -+++ clapack-3.2.1-CMAKE.cotire/TESTING/LIN/CMakeLists.txt 2012-03-24 20:08:13.000000000 +0100 -@@ -190,6 +190,12 @@ set(ZLINTSTRFP zchkrfp.c zdrvrfp.c zdrv - macro(add_lin_executable name ) - add_executable(${name} ${ARGN}) - target_link_libraries(${name} tmglib lapack) -+ if (COMMAND cotire) -+ cotire(${name}) -+ if (TARGET ${name}_unity) -+ target_link_libraries(${name}_unity tmglib lapack ) -+ endif() -+ endif() - endmacro(add_lin_executable) - - add_lin_executable(xlintsts ${ALINTST} ${SCLNTST} ${SLINTST} -diff -rupN clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/TESTING/MATGEN/CMakeLists.txt ---- clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200 -+++ clapack-3.2.1-CMAKE.cotire/TESTING/MATGEN/CMakeLists.txt 2012-03-24 20:05:19.000000000 +0100 -@@ -67,3 +67,6 @@ if(BUILD_COMPLEX16) - endif() - add_library(tmglib ${ALLOBJ} ) - -+if (COMMAND cotire) -+ cotire(tmglib) -+endif() diff --git a/cotire/Patches/cmake-2.8.7.patch b/cotire/Patches/cmake-2.8.7.patch deleted file mode 100644 index d80a2230f..000000000 --- a/cotire/Patches/cmake-2.8.7.patch +++ /dev/null @@ -1,218 +0,0 @@ -diff -rupN cmake-2.8.7/CMakeLists.txt cmake-2.8.7.cotire/CMakeLists.txt ---- cmake-2.8.7/CMakeLists.txt 2011-12-30 17:49:56.000000000 +0100 -+++ cmake-2.8.7.cotire/CMakeLists.txt 2012-03-24 14:41:40.000000000 +0100 -@@ -13,6 +13,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FAT - SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required - PROJECT(CMake) - -+include(Modules/cotire.cmake) -+ - IF(CMAKE_BOOTSTRAP) - # Running from bootstrap script. Set local variable and remove from cache. - SET(CMAKE_BOOTSTRAP 1) -diff -rupN cmake-2.8.7/Source/CMakeLists.txt cmake-2.8.7.cotire/Source/CMakeLists.txt ---- cmake-2.8.7/Source/CMakeLists.txt 2011-12-30 17:49:56.000000000 +0100 -+++ cmake-2.8.7.cotire/Source/CMakeLists.txt 2012-02-24 22:35:58.000000000 +0100 -@@ -364,6 +364,9 @@ TARGET_LINK_LIBRARIES(CMakeLib cmsys - IF(APPLE) - TARGET_LINK_LIBRARIES(CMakeLib "-framework CoreFoundation") - ENDIF(APPLE) -+if (COMMAND cotire) -+cotire(CMakeLib) -+endif() - - # On some platforms we need the rpcrt4 library for the VS 7 generators. - IF(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW) -@@ -433,6 +436,9 @@ SET(CTEST_SRCS cmCTest.cxx - # Build CTestLib - ADD_LIBRARY(CTestLib ${CTEST_SRCS}) - TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_LIBRARIES}) -+if (COMMAND cotire) -+cotire(CTestLib) -+endif() - - # - # Sources for CPack -@@ -477,6 +483,9 @@ ENDIF(APPLE) - # Build CPackLib - ADD_LIBRARY(CPackLib ${CPACK_SRCS}) - TARGET_LINK_LIBRARIES(CPackLib CMakeLib) -+if (COMMAND cotire) -+cotire(CPackLib) -+endif() - - IF(APPLE) - ADD_EXECUTABLE(cmakexbuild cmakexbuild.cxx) -@@ -485,11 +494,17 @@ IF(APPLE) - CPack/OSXScriptLauncher.cxx) - TARGET_LINK_LIBRARIES(OSXScriptLauncher cmsys) - TARGET_LINK_LIBRARIES(OSXScriptLauncher "-framework CoreFoundation") -+if (COMMAND cotire) -+cotire(cmakexbuild) -+endif() - ENDIF(APPLE) - - # Build CMake executable - ADD_EXECUTABLE(cmake cmakemain.cxx) - TARGET_LINK_LIBRARIES(cmake CMakeLib) -+if (COMMAND cotire) -+cotire(cmake) -+endif() - - # Build special executable for running programs on Windows 98 - IF(WIN32) -@@ -503,10 +518,16 @@ ENDIF(WIN32) - # Build CTest executable - ADD_EXECUTABLE(ctest ctest.cxx) - TARGET_LINK_LIBRARIES(ctest CTestLib) -+if (COMMAND cotire) -+cotire(ctest) -+endif() - - # Build CPack executable - ADD_EXECUTABLE(cpack CPack/cpack.cxx) - TARGET_LINK_LIBRARIES(cpack CPackLib) -+if (COMMAND cotire) -+cotire(cpack) -+endif() - - # Curses GUI - IF(BUILD_CursesDialog) -diff -rupN cmake-2.8.7/Source/CursesDialog/CMakeLists.txt cmake-2.8.7.cotire/Source/CursesDialog/CMakeLists.txt ---- cmake-2.8.7/Source/CursesDialog/CMakeLists.txt 2011-12-30 17:49:57.000000000 +0100 -+++ cmake-2.8.7.cotire/Source/CursesDialog/CMakeLists.txt 2012-02-22 20:41:03.000000000 +0100 -@@ -33,5 +33,7 @@ INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PAT - ADD_EXECUTABLE(ccmake ${CURSES_SRCS} ) - TARGET_LINK_LIBRARIES(ccmake CMakeLib) - TARGET_LINK_LIBRARIES(ccmake cmForm) -- -+if (COMMAND cotire) -+cotire(ccmake) -+endif() - INSTALL_TARGETS(/bin ccmake) -diff -rupN cmake-2.8.7/Source/CursesDialog/form/CMakeLists.txt cmake-2.8.7.cotire/Source/CursesDialog/form/CMakeLists.txt ---- cmake-2.8.7/Source/CursesDialog/form/CMakeLists.txt 2011-12-30 17:49:57.000000000 +0100 -+++ cmake-2.8.7.cotire/Source/CursesDialog/form/CMakeLists.txt 2012-02-24 21:30:47.000000000 +0100 -@@ -64,3 +64,6 @@ TARGET_LINK_LIBRARIES(cmForm ${CURSES_LI - IF(CURSES_EXTRA_LIBRARY) - TARGET_LINK_LIBRARIES(cmForm ${CURSES_EXTRA_LIBRARY}) - ENDIF(CURSES_EXTRA_LIBRARY) -+if (COMMAND cotire) -+cotire(cmForm) -+endif() -diff -rupN cmake-2.8.7/Source/kwsys/CMakeLists.txt cmake-2.8.7.cotire/Source/kwsys/CMakeLists.txt ---- cmake-2.8.7/Source/kwsys/CMakeLists.txt 2011-12-30 17:49:57.000000000 +0100 -+++ cmake-2.8.7.cotire/Source/kwsys/CMakeLists.txt 2012-03-24 15:03:17.000000000 +0100 -@@ -926,6 +926,9 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) - ADD_LIBRARY(${KWSYS_NAMESPACE}TestDynload MODULE testDynload.c) - SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestDynload PROPERTY LABELS ${KWSYS_LABELS_LIB}) - ADD_DEPENDENCIES(${KWSYS_NAMESPACE}TestDynload ${KWSYS_NAMESPACE}) -+if (COMMAND cotire) -+cotire(${KWSYS_NAMESPACE}TestDynload) -+endif() - ENDIF(KWSYS_USE_DynamicLoader) - CREATE_TEST_SOURCELIST( - KWSYS_CXX_TEST_SRCS ${KWSYS_NAMESPACE}TestsCxx.cxx -@@ -934,6 +937,9 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) - ADD_EXECUTABLE(${KWSYS_NAMESPACE}TestsCxx ${KWSYS_CXX_TEST_SRCS}) - SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestsCxx PROPERTY LABELS ${KWSYS_LABELS_EXE}) - TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE}TestsCxx ${KWSYS_NAMESPACE}) -+if (COMMAND cotire) -+cotire(${KWSYS_NAMESPACE}TestsCxx) -+endif() - SET(TEST_SYSTEMTOOLS_BIN_FILE - "${CMAKE_CURRENT_SOURCE_DIR}/testSystemTools.bin") - SET(TEST_SYSTEMTOOLS_SRC_FILE -diff -rupN cmake-2.8.7/Utilities/cmbzip2/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmbzip2/CMakeLists.txt ---- cmake-2.8.7/Utilities/cmbzip2/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100 -+++ cmake-2.8.7.cotire/Utilities/cmbzip2/CMakeLists.txt 2012-02-22 20:45:26.000000000 +0100 -@@ -2,3 +2,6 @@ project(bzip2) - add_definitions(-D_FILE_OFFSET_BITS=64) - add_library(cmbzip2 - blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c) -+if (COMMAND cotire) -+cotire(cmbzip2) -+endif() -\ No newline at end of file -diff -rupN cmake-2.8.7/Utilities/cmcompress/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmcompress/CMakeLists.txt ---- cmake-2.8.7/Utilities/cmcompress/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100 -+++ cmake-2.8.7.cotire/Utilities/cmcompress/CMakeLists.txt 2012-02-22 20:45:29.000000000 +0100 -@@ -3,3 +3,6 @@ PROJECT(CMCompress) - ADD_LIBRARY(cmcompress cmcompress.c) - - INSTALL(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST}/cmcompress) -+if (COMMAND cotire) -+cotire(cmcompress) -+endif() -\ No newline at end of file -diff -rupN cmake-2.8.7/Utilities/cmcurl/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmcurl/CMakeLists.txt ---- cmake-2.8.7/Utilities/cmcurl/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100 -+++ cmake-2.8.7.cotire/Utilities/cmcurl/CMakeLists.txt 2012-02-22 20:43:57.000000000 +0100 -@@ -706,6 +706,9 @@ IF(CMAKE_BUILD_CURL_SHARED) - RUNTIME_OUTPUT_DIRECTORY ${CMake_BIN_DIR}) - INSTALL_TARGETS(/bin cmcurl) - ENDIF(CMAKE_BUILD_CURL_SHARED) -+if (COMMAND cotire) -+cotire(cmcurl) -+endif() - - OPTION(CURL_TESTING "Do libCurl testing" OFF) - IF(CURL_TESTING) -diff -rupN cmake-2.8.7/Utilities/cmexpat/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmexpat/CMakeLists.txt ---- cmake-2.8.7/Utilities/cmexpat/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100 -+++ cmake-2.8.7.cotire/Utilities/cmexpat/CMakeLists.txt 2012-02-22 20:45:40.000000000 +0100 -@@ -32,3 +32,6 @@ CONFIGURE_FILE(${CMEXPAT_SOURCE_DIR}/exp - - ADD_LIBRARY(cmexpat ${expat_SRCS}) - INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmexpat) -+if (COMMAND cotire) -+cotire(cmexpat) -+endif() -\ No newline at end of file -diff -rupN cmake-2.8.7/Utilities/cmlibarchive/libarchive/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmlibarchive/libarchive/CMakeLists.txt ---- cmake-2.8.7/Utilities/cmlibarchive/libarchive/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100 -+++ cmake-2.8.7.cotire/Utilities/cmlibarchive/libarchive/CMakeLists.txt 2012-02-22 20:45:55.000000000 +0100 -@@ -116,6 +116,9 @@ IF(BUILD_ARCHIVE_WITHIN_CMAKE) - # and call the library cmlibarchive - ADD_LIBRARY(cmlibarchive STATIC ${libarchive_SOURCES} ${include_HEADERS}) - TARGET_LINK_LIBRARIES(cmlibarchive ${ADDITIONAL_LIBS}) -+if (COMMAND cotire) -+cotire(cmlibarchive) -+endif() - ELSE() - # Libarchive is a shared library - ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS}) -@@ -123,7 +126,10 @@ ELSE() - SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION}) - SET_TARGET_PROPERTIES(archive PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -- -+if (COMMAND cotire) -+cotire(archive) -+endif() -+ - # archive_static is a static library - ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS}) - SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS -@@ -134,6 +140,9 @@ ELSE() - IF(NOT WIN32 OR CYGWIN) - SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive) - ENDIF(NOT WIN32 OR CYGWIN) -+if (COMMAND cotire) -+cotire(archive_static) -+endif() - - # How to install the libraries - INSTALL(TARGETS archive archive_static -diff -rupN cmake-2.8.7/Utilities/cmzlib/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmzlib/CMakeLists.txt ---- cmake-2.8.7/Utilities/cmzlib/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100 -+++ cmake-2.8.7.cotire/Utilities/cmzlib/CMakeLists.txt 2012-02-22 20:42:30.000000000 +0100 -@@ -39,5 +39,7 @@ ENDFOREACH(name) - - - ADD_LIBRARY(cmzlib ${ZLIB_SRCS}) -- -+if (COMMAND cmzlib) -+cotire(cmzlib) -+endif() - INSTALL(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST}/cmzlib) diff --git a/cotire/Patches/cminpack-1.1.4.patch b/cotire/Patches/cminpack-1.1.4.patch deleted file mode 100644 index 23fdee53a..000000000 --- a/cotire/Patches/cminpack-1.1.4.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -rupN cminpack-1.1.4/CMakeLists.txt cminpack-1.1.4.cotire/CMakeLists.txt ---- cminpack-1.1.4/CMakeLists.txt 2011-04-15 08:51:13.000000000 +0200 -+++ cminpack-1.1.4.cotire/CMakeLists.txt 2012-03-24 20:21:19.000000000 +0100 -@@ -6,6 +6,7 @@ project (CMINPACK) - string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER) - - include(${PROJECT_SOURCE_DIR}/cmake/cminpack_utils.cmake) -+include(${PROJECT_SOURCE_DIR}/cmake/cotire.cmake) - # Set version and OS-specific settings - set(CMINPACK_VERSION 1.0.90 CACHE STRING "CMinpack version") - DISSECT_VERSION() -@@ -70,3 +71,6 @@ endif (USE_FPIC AND NOT SHARED_LIBS) - - set_target_properties(cminpack PROPERTIES VERSION ${CMINPACK_VERSION}) - -+if (COMMAND cotire) -+ cotire(cminpack) -+endif() diff --git a/cotire/Patches/hdf5-1.8.8.patch b/cotire/Patches/hdf5-1.8.8.patch deleted file mode 100644 index d0ed54b48..000000000 --- a/cotire/Patches/hdf5-1.8.8.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -rupN hdf5-1.8.8/CMakeLists.txt hdf5-1.8.8.cotire/CMakeLists.txt ---- hdf5-1.8.8/CMakeLists.txt 2011-11-07 23:11:41.000000000 +0100 -+++ hdf5-1.8.8.cotire/CMakeLists.txt 2012-03-24 17:30:29.000000000 +0100 -@@ -200,6 +200,7 @@ SET (HDF5_PACKAGE_BUGREPORT "help@hdfgro - #----------------------------------------------------------------------------- - INCLUDE (${HDF5_RESOURCES_DIR}/HDFMacros.cmake) - INCLUDE (${HDF5_RESOURCES_DIR}/HDF5Macros.cmake) -+INCLUDE (${HDF5_RESOURCES_DIR}/cotire.cmake) - - #----------------------------------------------------------------------------- - # Setup output Directories -diff -rupN hdf5-1.8.8/c++/src/CMakeLists.txt hdf5-1.8.8.cotire/c++/src/CMakeLists.txt ---- hdf5-1.8.8/c++/src/CMakeLists.txt 2011-11-07 23:11:40.000000000 +0100 -+++ hdf5-1.8.8.cotire/c++/src/CMakeLists.txt 2012-03-24 17:29:43.000000000 +0100 -@@ -85,6 +85,9 @@ ADD_LIBRARY (${HDF5_CPP_LIB_TARGET} ${LI - TARGET_LINK_LIBRARIES (${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET}) - SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}") - H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} ${LIB_TYPE}) -+if (COMMAND cotire) -+cotire(${HDF5_CPP_LIB_TARGET}) -+endif() - - #----------------------------------------------------------------------------- - # Add file(s) to CMake Install -diff -rupN hdf5-1.8.8/fortran/src/CMakeLists.txt hdf5-1.8.8.cotire/fortran/src/CMakeLists.txt ---- hdf5-1.8.8/fortran/src/CMakeLists.txt 2011-11-07 23:11:41.000000000 +0100 -+++ hdf5-1.8.8.cotire/fortran/src/CMakeLists.txt 2012-03-24 17:30:02.000000000 +0100 -@@ -118,6 +118,9 @@ ADD_LIBRARY (${HDF5_F90_C_LIB_TARGET} ${ - TARGET_LINK_LIBRARIES (${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET}) - SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}") - H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_NAME} ${LIB_TYPE}) -+if (COMMAND cotire) -+cotire(${HDF5_F90_C_LIB_TARGET}) -+endif() - - #----------------------------------------------------------------------------- - # Fortran 2003 standard -@@ -221,6 +224,7 @@ SET_TARGET_PROPERTIES (${HDF5_F90_LIB_TA - TARGET_LINK_LIBRARIES (${HDF5_F90_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET}) - SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIB_TARGET}") - H5_SET_LIB_OPTIONS (${HDF5_F90_LIB_TARGET} ${HDF5_F90_LIB_NAME} ${LIB_TYPE}) -+cotire(${HDF5_F90_LIB_TARGET}) - - #----------------------------------------------------------------------------- - # Add file(s) to CMake Install -diff -rupN hdf5-1.8.8/hl/c++/src/CMakeLists.txt hdf5-1.8.8.cotire/hl/c++/src/CMakeLists.txt ---- hdf5-1.8.8/hl/c++/src/CMakeLists.txt 2011-11-07 23:11:39.000000000 +0100 -+++ hdf5-1.8.8.cotire/hl/c++/src/CMakeLists.txt 2012-03-24 17:29:52.000000000 +0100 -@@ -18,6 +18,9 @@ TARGET_LINK_LIBRARIES ( - ) - SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}") - H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} ${LIB_TYPE}) -+if (COMMAND cotire) -+cotire(${HDF5_HL_CPP_LIB_TARGET}) -+endif() - - #----------------------------------------------------------------------------- - # Add file(s) to CMake Install -diff -rupN hdf5-1.8.8/hl/src/CMakeLists.txt hdf5-1.8.8.cotire/hl/src/CMakeLists.txt ---- hdf5-1.8.8/hl/src/CMakeLists.txt 2011-11-07 23:11:38.000000000 +0100 -+++ hdf5-1.8.8.cotire/hl/src/CMakeLists.txt 2012-03-24 17:30:11.000000000 +0100 -@@ -37,6 +37,9 @@ ADD_LIBRARY (${HDF5_HL_LIB_TARGET} ${LIB - TARGET_LINK_LIBRARIES (${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET}) - SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_LIB_TARGET}") - H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} ${LIB_TYPE}) -+if (COMMAND cotire) -+cotire(${HDF5_HL_LIB_TARGET}) -+endif() - - #----------------------------------------------------------------------------- - # Add file(s) to CMake Install -diff -rupN hdf5-1.8.8/src/CMakeLists.txt hdf5-1.8.8.cotire/src/CMakeLists.txt ---- hdf5-1.8.8/src/CMakeLists.txt 2011-11-07 23:11:30.000000000 +0100 -+++ hdf5-1.8.8.cotire/src/CMakeLists.txt 2012-03-24 17:29:26.000000000 +0100 -@@ -631,6 +631,16 @@ ADD_LIBRARY (${HDF5_LIB_TARGET} ${LIB_TY - TARGET_LINK_LIBRARIES (${HDF5_LIB_TARGET} ${LINK_LIBS}) - SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET}) - H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} ${LIB_TYPE}) -+#set_target_properties(${HDF5_LIB_TARGET} PROPERTIES COTIRE_IGNORED_INCLUDE_DIRECTORIES "/Developer/usr;/usr/llvm-gcc-4.2;${CMAKE_SOURCE_DIR};${CMAKE_BINARY_DIR}") -+ -+if (COMMAND cotire) -+SET_SOURCE_FILES_PROPERTIES ( -+"${HDF5_BINARY_DIR}/H5overflow.h" -+"${HDF5_BINARY_DIR}/H5version.h" -+"${HDF5_BINARY_DIR}/H5Edefin.h" -+PROPERTIES COTIRE_DEPENDENCY FALSE) -+cotire(${HDF5_LIB_TARGET}) -+endif() - - #----------------------------------------------------------------------------- - # Add file(s) to CMake Install -Binary files hdf5-1.8.8/src/H5public.h.gch and hdf5-1.8.8.cotire/src/H5public.h.gch differ -diff -rupN hdf5-1.8.8/test/CMakeLists.txt hdf5-1.8.8.cotire/test/CMakeLists.txt ---- hdf5-1.8.8/test/CMakeLists.txt 2011-11-07 23:11:23.000000000 +0100 -+++ hdf5-1.8.8.cotire/test/CMakeLists.txt 2012-03-24 17:30:22.000000000 +0100 -@@ -30,6 +30,9 @@ IF (MINGW) - ENDIF (MINGW) - TARGET_LINK_LIBRARIES (${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) - H5_SET_LIB_OPTIONS (${HDF5_TEST_LIB_TARGET} ${HDF5_TEST_LIB_NAME} ${LIB_TYPE}) -+if (COMMAND cotire) -+cotire(${HDF5_TEST_LIB_TARGET}) -+endif() - - # -------------------------------------------------------------------- - # Copy all the HDF5 files from the test directory into the source directory -diff -rupN hdf5-1.8.8/tools/lib/CMakeLists.txt hdf5-1.8.8.cotire/tools/lib/CMakeLists.txt ---- hdf5-1.8.8/tools/lib/CMakeLists.txt 2011-11-07 23:11:35.000000000 +0100 -+++ hdf5-1.8.8.cotire/tools/lib/CMakeLists.txt 2012-03-24 17:28:41.000000000 +0100 -@@ -40,6 +40,9 @@ H5_SET_LIB_OPTIONS ( - HDF5_TOOLS_LIB_NAME_RELEASE - HDF5_TOOLS_LIB_NAME_DEBUG - ) -+if (COMMAND cotire) -+cotire(${HDF5_TOOLS_LIB_TARGET}) -+endif() - - ############################################################################## - ############################################################################## diff --git a/cotire/Patches/libpng-1.5.9.patch b/cotire/Patches/libpng-1.5.9.patch deleted file mode 100644 index 09e987df8..000000000 --- a/cotire/Patches/libpng-1.5.9.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -rupN libpng-1.5.9/CMakeLists.txt libpng-1.5.9.cotire/CMakeLists.txt ---- libpng-1.5.9/CMakeLists.txt 2012-02-18 21:31:14.000000000 +0100 -+++ libpng-1.5.9.cotire/CMakeLists.txt 2012-03-24 18:08:54.000000000 +0100 -@@ -9,6 +9,8 @@ - cmake_minimum_required(VERSION 2.4.4) - set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - -+include("${CMAKE_SOURCE_DIR}/cotire.cmake") -+ - if(UNIX AND NOT DEFINED CMAKE_BUILD_TYPE) - if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) - # workaround CMake 2.4.x bug -@@ -146,6 +148,12 @@ if(PNG_SHARED) - set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib") - endif() - target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ if (COMMAND cotire) -+ cotire(${PNG_LIB_NAME}) -+ if (TARGET ${PNG_LIB_NAME}_unity) -+ target_link_libraries(${PNG_LIB_NAME}_unity ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ endif() -+ endif() - endif() - - if(PNG_STATIC) -@@ -157,6 +165,12 @@ if(PNG_STATIC) - set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib") - endif() - target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ if (COMMAND cotire) -+ cotire(${PNG_LIB_NAME_STATIC}) -+ if (TARGET ${PNG_LIB_NAME_STATIC}_unity) -+ target_link_libraries(${PNG_LIB_NAME_STATIC}_unity ${ZLIB_LIBRARY} ${M_LIBRARY}) -+ endif() -+ endif() - endif() - - if(PNG_SHARED AND WIN32) diff --git a/cotire/Patches/llvm-3.0.src.patch b/cotire/Patches/llvm-3.0.src.patch deleted file mode 100644 index 0ae3af023..000000000 --- a/cotire/Patches/llvm-3.0.src.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -rupN llvm-3.0.src/CMakeLists.txt llvm-3.0.src.cotire/CMakeLists.txt ---- llvm-3.0.src/CMakeLists.txt 2011-10-06 03:51:51.000000000 +0200 -+++ llvm-3.0.src.cotire/CMakeLists.txt 2012-03-26 20:59:22.000000000 +0200 -@@ -15,6 +15,7 @@ set(PACKAGE_VERSION "3.0") - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - - include(VersionFromVCS) -+include(cotire) - - option(LLVM_APPEND_VC_REV - "Append the version control system revision id to LLVM version" OFF) -diff -rupN llvm-3.0.src/cmake/modules/AddLLVM.cmake llvm-3.0.src.cotire/cmake/modules/AddLLVM.cmake ---- llvm-3.0.src/cmake/modules/AddLLVM.cmake 2011-07-30 10:47:05.000000000 +0200 -+++ llvm-3.0.src.cotire/cmake/modules/AddLLVM.cmake 2012-03-26 20:59:22.000000000 +0200 -@@ -25,6 +25,9 @@ macro(add_llvm_library name) - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Libraries") -+ if (COMMAND cotire) -+ cotire(${name}) -+ endif() - endmacro(add_llvm_library name) - - macro(add_llvm_library_dependencies name) -@@ -69,6 +72,9 @@ ${name} ignored.") - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) - endif() -+ if (COMMAND cotire) -+ cotire(${name}) -+ endif() - endif() - - set_target_properties(${name} PROPERTIES FOLDER "Loadable modules") -@@ -89,6 +95,9 @@ macro(add_llvm_executable name) - add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) - endif( LLVM_COMMON_DEPENDS ) - link_system_libs( ${name} ) -+ if (COMMAND cotire) -+ cotire(${name}) -+ endif() - endmacro(add_llvm_executable name) - - -diff -rupN llvm-3.0.src/lib/Analysis/CMakeLists.txt llvm-3.0.src.cotire/lib/Analysis/CMakeLists.txt ---- llvm-3.0.src/lib/Analysis/CMakeLists.txt 2011-07-29 02:14:25.000000000 +0200 -+++ llvm-3.0.src.cotire/lib/Analysis/CMakeLists.txt 2012-03-26 20:59:36.000000000 +0200 -@@ -1,3 +1,7 @@ -+if (COMMAND cotire) -+ set_source_files_properties (ConstantFolding.cpp PROPERTIES COTIRE_EXCLUDED TRUE) -+endif() -+ - add_llvm_library(LLVMAnalysis - AliasAnalysis.cpp - AliasAnalysisCounter.cpp -diff -rupN llvm-3.0.src/lib/Support/CMakeLists.txt llvm-3.0.src.cotire/lib/Support/CMakeLists.txt ---- llvm-3.0.src/lib/Support/CMakeLists.txt 2011-09-13 21:42:16.000000000 +0200 -+++ llvm-3.0.src.cotire/lib/Support/CMakeLists.txt 2012-03-26 20:59:22.000000000 +0200 -@@ -4,6 +4,10 @@ if( MINGW ) - set(LLVM_REQUIRES_EH 1) - endif() - -+if (COMMAND cotire) -+ set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE) -+endif() -+ - add_llvm_library(LLVMSupport - APFloat.cpp - APInt.cpp diff --git a/cotire/Patches/llvm-3.1.src.patch b/cotire/Patches/llvm-3.1.src.patch deleted file mode 100644 index 4a0a9c6f4..000000000 --- a/cotire/Patches/llvm-3.1.src.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -rupN llvm-3.1.src/CMakeLists.txt llvm-3.1.src.cotire/CMakeLists.txt ---- llvm-3.1.src/CMakeLists.txt 2012-05-16 00:06:08.000000000 +0200 -+++ llvm-3.1.src.cotire/CMakeLists.txt 2012-05-23 19:49:12.000000000 +0200 -@@ -18,6 +18,7 @@ set(PACKAGE_VERSION "${LLVM_VERSION_MAJO - set_property(GLOBAL PROPERTY USE_FOLDERS ON) - - include(VersionFromVCS) -+include(cotire) - - option(LLVM_APPEND_VC_REV - "Append the version control system revision id to LLVM version" OFF) -diff -rupN llvm-3.1.src/cmake/modules/AddLLVM.cmake llvm-3.1.src.cotire/cmake/modules/AddLLVM.cmake ---- llvm-3.1.src/cmake/modules/AddLLVM.cmake 2011-11-29 20:25:30.000000000 +0100 -+++ llvm-3.1.src.cotire/cmake/modules/AddLLVM.cmake 2012-05-23 19:49:59.000000000 +0200 -@@ -25,6 +25,9 @@ macro(add_llvm_library name) - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Libraries") -+ if (COMMAND cotire) -+ cotire(${name}) -+ endif() - - # Add the explicit dependency information for this library. - # -@@ -68,6 +71,9 @@ ${name} ignored.") - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) - endif() -+ if (COMMAND cotire) -+ cotire(${name}) -+ endif() - endif() - - set_target_properties(${name} PROPERTIES FOLDER "Loadable modules") -@@ -88,6 +94,9 @@ macro(add_llvm_executable name) - add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) - endif( LLVM_COMMON_DEPENDS ) - link_system_libs( ${name} ) -+ if (COMMAND cotire) -+ cotire(${name}) -+ endif() - endmacro(add_llvm_executable name) - - -diff -rupN llvm-3.1.src/lib/Analysis/CMakeLists.txt llvm-3.1.src.cotire/lib/Analysis/CMakeLists.txt ---- llvm-3.1.src/lib/Analysis/CMakeLists.txt 2012-03-16 06:51:52.000000000 +0100 -+++ llvm-3.1.src.cotire/lib/Analysis/CMakeLists.txt 2012-05-23 19:49:12.000000000 +0200 -@@ -1,3 +1,7 @@ -+if (COMMAND cotire) -+ set_source_files_properties (ConstantFolding.cpp PROPERTIES COTIRE_EXCLUDED TRUE) -+endif() -+ - add_llvm_library(LLVMAnalysis - AliasAnalysis.cpp - AliasAnalysisCounter.cpp -diff -rupN llvm-3.1.src/lib/Support/CMakeLists.txt llvm-3.1.src.cotire/lib/Support/CMakeLists.txt ---- llvm-3.1.src/lib/Support/CMakeLists.txt 2012-04-17 22:03:03.000000000 +0200 -+++ llvm-3.1.src.cotire/lib/Support/CMakeLists.txt 2012-05-23 19:49:12.000000000 +0200 -@@ -4,6 +4,10 @@ if( MINGW ) - set(LLVM_REQUIRES_EH 1) - endif() - -+if (COMMAND cotire) -+ set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE) -+endif() -+ - add_llvm_library(LLVMSupport - APFloat.cpp - APInt.cpp diff --git a/cotire/Patches/llvm-3.3.src.patch b/cotire/Patches/llvm-3.3.src.patch deleted file mode 100644 index f1109f48f..000000000 --- a/cotire/Patches/llvm-3.3.src.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff -rupN llvm-3.3.src/CMakeLists.txt llvm-3.3.src.cotire/CMakeLists.txt ---- llvm-3.3.src/CMakeLists.txt 2013-05-06 18:23:07.000000000 +0200 -+++ llvm-3.3.src.cotire/CMakeLists.txt 2013-10-13 10:05:20.000000000 +0200 -@@ -1,7 +1,7 @@ - # See docs/CMake.html for instructions about how to build LLVM with CMake. - - project(LLVM) --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 2.8.11) - - # Add path for custom modules - set(CMAKE_MODULE_PATH -@@ -21,6 +21,8 @@ if ( LLVM_USE_FOLDERS ) - endif() - - include(VersionFromVCS) -+include(cotire) -+set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY") - - option(LLVM_APPEND_VC_REV - "Append the version control system revision id to LLVM version" OFF) -@@ -187,7 +189,7 @@ option(LLVM_USE_OPROFILE - # If enabled, verify we are on a platform that supports oprofile. - if( LLVM_USE_OPROFILE ) - if( NOT CMAKE_SYSTEM_NAME MATCHES "Linux" ) -- message(FATAL_ERROR "OProfile support is available on Linux only.") -+ message(FATAL_ERROR "OProfile support is available on Linux only.") - endif( NOT CMAKE_SYSTEM_NAME MATCHES "Linux" ) - endif( LLVM_USE_OPROFILE ) - -diff -rupN llvm-3.3.src/cmake/modules/AddLLVM.cmake llvm-3.3.src.cotire/cmake/modules/AddLLVM.cmake ---- llvm-3.3.src/cmake/modules/AddLLVM.cmake 2013-04-21 11:04:59.000000000 +0200 -+++ llvm-3.3.src.cotire/cmake/modules/AddLLVM.cmake 2013-10-13 10:43:04.000000000 +0200 -@@ -34,6 +34,10 @@ macro(add_llvm_library name) - # property has been set to an empty value. - get_property(lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${name}) - target_link_libraries(${name} ${lib_deps}) -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_library name) - - macro(add_llvm_loadable_module name) -@@ -69,6 +73,10 @@ ${name} ignored.") - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) - endif() -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endif() - - set_target_properties(${name} PROPERTIES FOLDER "Loadable modules") -@@ -101,6 +109,10 @@ macro(add_llvm_tool name) - install(TARGETS ${name} RUNTIME DESTINATION bin) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Tools") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_tool name) - - -@@ -114,12 +126,20 @@ macro(add_llvm_example name) - install(TARGETS ${name} RUNTIME DESTINATION examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_example name) - - - macro(add_llvm_utility name) - add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "Utils") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_utility name) - - -@@ -198,6 +218,10 @@ function(add_unittest test_suite test_na - set(target_compile_flags "${target_compile_flags} -Wno-variadic-macros") - endif () - set_property(TARGET ${test_name} PROPERTY COMPILE_FLAGS "${target_compile_flags}") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endfunction() - - # This function provides an automatic way to 'configure'-like generate a file -diff -rupN llvm-3.3.src/include/llvm/Transforms/Utils/BlackList.h llvm-3.3.src.cotire/include/llvm/Transforms/Utils/BlackList.h ---- llvm-3.3.src/include/llvm/Transforms/Utils/BlackList.h 2013-04-11 15:20:00.000000000 +0200 -+++ llvm-3.3.src.cotire/include/llvm/Transforms/Utils/BlackList.h 2013-10-13 11:52:41.000000000 +0200 -@@ -30,6 +30,9 @@ - //===----------------------------------------------------------------------===// - // - -+#ifndef LLVM_TRANSFORMS_UTILS_BLACKLIST_H -+#define LLVM_TRANSFORMS_UTILS_BLACKLIST_H -+ - #include "llvm/ADT/StringMap.h" - - namespace llvm { -@@ -57,3 +60,5 @@ class BlackList { - }; - - } // namespace llvm -+ -+#endif -diff -rupN llvm-3.3.src/lib/Support/CMakeLists.txt llvm-3.3.src.cotire/lib/Support/CMakeLists.txt ---- llvm-3.3.src/lib/Support/CMakeLists.txt 2013-04-23 10:28:39.000000000 +0200 -+++ llvm-3.3.src.cotire/lib/Support/CMakeLists.txt 2013-10-13 10:25:45.000000000 +0200 -@@ -1,3 +1,7 @@ -+if (COMMAND cotire) -+ set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE) -+endif() -+ - add_llvm_library(LLVMSupport - APFloat.cpp - APInt.cpp diff --git a/cotire/Patches/llvm-3.4.src.patch b/cotire/Patches/llvm-3.4.src.patch deleted file mode 100644 index 631d1c7de..000000000 --- a/cotire/Patches/llvm-3.4.src.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -rupN llvm-3.4.src/CMakeLists.txt llvm-3.4.src.cotire/CMakeLists.txt ---- llvm-3.4.src/CMakeLists.txt 2013-11-25 19:34:26.000000000 +0100 -+++ llvm-3.4.src.cotire/CMakeLists.txt 2014-01-06 20:25:12.000000000 +0100 -@@ -1,7 +1,7 @@ - # See docs/CMake.html for instructions about how to build LLVM with CMake. - - project(LLVM) --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 2.8.12) - - # Add path for custom modules - set(CMAKE_MODULE_PATH -@@ -25,6 +25,8 @@ if ( LLVM_USE_FOLDERS ) - endif() - - include(VersionFromVCS) -+include(cotire) -+set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY") - - option(LLVM_APPEND_VC_REV - "Append the version control system revision id to LLVM version" OFF) -diff -rupN llvm-3.4.src/cmake/modules/AddLLVM.cmake llvm-3.4.src.cotire/cmake/modules/AddLLVM.cmake ---- llvm-3.4.src/cmake/modules/AddLLVM.cmake 2013-08-27 21:25:01.000000000 +0200 -+++ llvm-3.4.src.cotire/cmake/modules/AddLLVM.cmake 2014-01-06 20:25:50.000000000 +0100 -@@ -41,6 +41,10 @@ macro(add_llvm_library name) - # property has been set to an empty value. - get_property(lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${name}) - target_link_libraries(${name} ${lib_deps}) -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_library name) - - macro(add_llvm_loadable_module name) -@@ -78,6 +82,10 @@ ${name} ignored.") - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) - endif() - endif() -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endif() - - set_target_properties(${name} PROPERTIES FOLDER "Loadable modules") -@@ -119,6 +127,10 @@ macro(add_llvm_tool name) - endif() - endif() - set_target_properties(${name} PROPERTIES FOLDER "Tools") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_tool name) - - -@@ -132,12 +144,20 @@ macro(add_llvm_example name) - install(TARGETS ${name} RUNTIME DESTINATION examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_example name) - - - macro(add_llvm_utility name) - add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "Utils") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_utility name) - - -@@ -245,6 +265,10 @@ function(add_unittest test_suite test_na - set(target_compile_flags "${target_compile_flags} -Wno-variadic-macros") - endif () - set_property(TARGET ${test_name} PROPERTY COMPILE_FLAGS "${target_compile_flags}") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endfunction() - - # This function provides an automatic way to 'configure'-like generate a file -diff -rupN llvm-3.4.src/lib/Support/CMakeLists.txt llvm-3.4.src.cotire/lib/Support/CMakeLists.txt ---- llvm-3.4.src/lib/Support/CMakeLists.txt 2013-09-04 18:00:12.000000000 +0200 -+++ llvm-3.4.src.cotire/lib/Support/CMakeLists.txt 2014-01-06 20:27:36.000000000 +0100 -@@ -1,3 +1,7 @@ -+if (COMMAND cotire) -+ set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE) -+endif() -+ - add_llvm_library(LLVMSupport - APFloat.cpp - APInt.cpp diff --git a/cotire/Patches/llvm-3.5.src.patch b/cotire/Patches/llvm-3.5.src.patch deleted file mode 100644 index fb39b6215..000000000 --- a/cotire/Patches/llvm-3.5.src.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -rupN --exclude=.DS_Store --exclude='*.pyc' llvm-3.5.0.src/CMakeLists.txt llvm-3.5.0.src.cotire/CMakeLists.txt ---- llvm-3.5.0.src/CMakeLists.txt 2014-07-04 06:23:26.000000000 +0200 -+++ llvm-3.5.0.src.cotire/CMakeLists.txt 2014-12-14 12:19:41.000000000 +0100 -@@ -1,6 +1,6 @@ - # See docs/CMake.html for instructions about how to build LLVM with CMake. - --cmake_minimum_required(VERSION 2.8.8) -+cmake_minimum_required(VERSION 2.8.12) - - # FIXME: It may be removed when we use 2.8.12. - if(CMAKE_VERSION VERSION_LESS 2.8.12) -@@ -41,6 +41,8 @@ if ( LLVM_USE_FOLDERS ) - endif() - - include(VersionFromVCS) -+include(cotire) -+set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY") - - option(LLVM_APPEND_VC_REV - "Append the version control system revision id to LLVM version" OFF) -diff -rupN --exclude=.DS_Store --exclude='*.pyc' llvm-3.5.0.src/cmake/modules/AddLLVM.cmake llvm-3.5.0.src.cotire/cmake/modules/AddLLVM.cmake ---- llvm-3.5.0.src/cmake/modules/AddLLVM.cmake 2014-07-23 17:19:01.000000000 +0200 -+++ llvm-3.5.0.src.cotire/cmake/modules/AddLLVM.cmake 2014-12-14 12:28:35.000000000 +0100 -@@ -106,6 +106,10 @@ function(add_llvm_symbol_exports target_ - set_property(TARGET ${target_name} APPEND_STRING PROPERTY - LINK_FLAGS " /DEF:${CMAKE_CURRENT_BINARY_DIR}/${native_export_file}") - endif() -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endif() - - add_custom_target(${target_name}_exports DEPENDS ${native_export_file}) -@@ -394,6 +398,10 @@ macro(add_llvm_library name) - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Libraries") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_library name) - - macro(add_llvm_loadable_module name) -@@ -422,6 +430,10 @@ macro(add_llvm_loadable_module name) - endif() - - set_target_properties(${name} PROPERTIES FOLDER "Loadable modules") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_loadable_module name) - - -@@ -471,6 +483,10 @@ macro(add_llvm_tool name) - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Tools") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_tool name) - - -@@ -483,12 +499,20 @@ macro(add_llvm_example name) - install(TARGETS ${name} RUNTIME DESTINATION examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_example name) - - - macro(add_llvm_utility name) - add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "Utils") -+if (COMMAND cotire) -+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE") -+ cotire(${name}) -+endif() - endmacro(add_llvm_utility name) - - -diff -rupN --exclude=.DS_Store --exclude='*.pyc' llvm-3.5.0.src/lib/Support/CMakeLists.txt llvm-3.5.0.src.cotire/lib/Support/CMakeLists.txt ---- llvm-3.5.0.src/lib/Support/CMakeLists.txt 2014-07-17 22:05:29.000000000 +0200 -+++ llvm-3.5.0.src.cotire/lib/Support/CMakeLists.txt 2014-12-14 12:17:10.000000000 +0100 -@@ -1,3 +1,7 @@ -+if (COMMAND cotire) -+ set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE) -+endif() -+ - add_llvm_library(LLVMSupport - APFloat.cpp - APInt.cpp diff --git a/cotire/Patches/yaml-cpp.patch b/cotire/Patches/yaml-cpp.patch deleted file mode 100644 index c6166fdf7..000000000 --- a/cotire/Patches/yaml-cpp.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -rupN yaml-cpp/CMakeLists.txt yaml-cpp-cotire/CMakeLists.txt ---- yaml-cpp/CMakeLists.txt 2012-01-21 09:52:48.000000000 +0100 -+++ yaml-cpp-cotire/CMakeLists.txt 2012-03-24 17:14:15.000000000 +0100 -@@ -14,6 +14,7 @@ if(POLICY CMP0015) - endif() - - include(CheckCXXCompilerFlag) -+include("${CMAKE_SOURCE_DIR}/cotire.cmake") - - - ### -@@ -235,6 +236,7 @@ add_library(yaml-cpp - ${contrib_private_headers} - ) - -+cotire(yaml-cpp) - set_target_properties(yaml-cpp PROPERTIES - VERSION "${YAML_CPP_VERSION}" - SOVERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}" -diff -rupN yaml-cpp/test/CMakeLists.txt yaml-cpp-cotire/test/CMakeLists.txt ---- yaml-cpp/test/CMakeLists.txt 2012-01-21 09:52:48.000000000 +0100 -+++ yaml-cpp-cotire/test/CMakeLists.txt 2012-02-19 10:21:36.000000000 +0100 -@@ -13,3 +13,5 @@ add_executable(run-tests - target_link_libraries(run-tests yaml-cpp) - - add_test(yaml-reader-test run-tests) -+ -+cotire(run-tests) -\ No newline at end of file -diff -rupN yaml-cpp/util/CMakeLists.txt yaml-cpp-cotire/util/CMakeLists.txt ---- yaml-cpp/util/CMakeLists.txt 2012-01-21 09:52:48.000000000 +0100 -+++ yaml-cpp-cotire/util/CMakeLists.txt 2012-02-19 10:21:54.000000000 +0100 -@@ -1,2 +1,3 @@ - add_executable(parse parse.cpp) - target_link_libraries(parse yaml-cpp) -+cotire(parse) -\ No newline at end of file diff --git a/cotire/Patches/zlib-1.2.6.patch b/cotire/Patches/zlib-1.2.6.patch deleted file mode 100644 index e48086fc2..000000000 --- a/cotire/Patches/zlib-1.2.6.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -rupN zlib-1.2.6/CMakeLists.txt zlib-1.2.6.cotire/CMakeLists.txt ---- zlib-1.2.6/CMakeLists.txt 2012-01-17 03:51:23.000000000 +0100 -+++ zlib-1.2.6.cotire/CMakeLists.txt 2012-03-24 21:08:41.000000000 +0100 -@@ -7,6 +7,8 @@ if(NOT DEFINED BUILD_SHARED_LIBS) - option(BUILD_SHARED_LIBS "Build a shared library form of zlib" ON) - endif() - -+include("${CMAKE_SOURCE_DIR}/cotire.cmake") -+ - include(CheckTypeSize) - include(CheckFunctionExists) - include(CheckIncludeFile) -@@ -176,6 +178,10 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_I - install(FILES zlib.3 DESTINATION share/man/man3) - endif() - -+if (COMMAND cotire) -+ cotire(zlib) -+endif() -+ - #============================================================================ - # Example binaries - #============================================================================ diff --git a/cotire/README.md b/cotire/README.md deleted file mode 100644 index cc4c8ded3..000000000 --- a/cotire/README.md +++ /dev/null @@ -1,137 +0,0 @@ -cotire -====== - -Cotire (compile time reducer) is a CMake module that speeds up the build process of CMake based -build systems by fully automating techniques as [precompiled header][pch] usage and -[single compilation unit][scu] builds for C and C++. - -features --------- - -* Non-intrusive. Requires no source code modification and only minimal changes to CMake list files. -* Automatically generates a [single compilation unit][scu] (aka unity source file) for a CMake target. -* Automatically generates a [prefix header][pfh] by tracking includes used by a CMake target. -* Automatically precompiles prefix header and applies resulting [precompiled header][pch] to a CMake target. -* Alternatively, allows for using manually maintained unity source and prefix header files. -* Supports C/C++ compilers Clang, GCC, Intel and Visual Studio C++. -* Supports mixed language CMake targets. -* Supports console (Makefile generator) and IDE (Visual Studio and Xcode) based builds. -* Compatible with CMake single build type and CMake multi-configuration builds. -* Compatible with most CMake generators (including [Ninja][ninja]). -* Supports multi-core unity builds for some generators (make -j, [jom][jom], Visual Studio, Ninja). -* Leverages native precompiled header generation features of IDEs (Visual Studio and Xcode). -* Compatible with CMake's [cross-compiling][ccrc] support. -* Compatible with compiler wrappers like [ccache][ccch]. -* Tested with Windows, Linux and OS X. -* MIT licensed. - -requirements ------------- - -* [CMake 2.8.12][cmk] or newer. The executable `cmake` should be on the system path. -* [Visual Studio C++][vslstd], [MinGW][mingw] or [Cygwin][cgwn] under Windows. -* [Clang][clang] under Windows, Linux or OS X. -* [GCC][gcc] under Linux or OS X. -* [Intel C++ compiler][intel] under Windows, Linux or OS X. -* [Xcode][xcdt] application or Xcode Command Line Tools under OS X. - -installation ------------- - -Copy the file `CMake/cotire.cmake` to the module directory of your CMake project. In the -top-level `CMakeList.txt` file, add the module directory to the CMake module search path: - - set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") - -usage ------ - -To use cotire in your CMake project, add the following include directive to the beginning of the -top-level `CMakeList.txt`: - - include(cotire) - -To speed the build process of a CMake library or executable target, just apply the `cotire` -function to the target: - - add_executable(MyExecutable ${MyExecutableSources}) - target_link_libraries(MyExecutable ${MyExecutableLibraries}) - cotire(MyExecutable) - -Cotire looks at the properties of the target provided by CMake (e.g., target type, source files, -compile flags, preprocessor defines, include directories, ...) and sets up custom commands that -will generate a unity source file, a prefix header and a precompiled header at build time -specially tailored to the target. - -For the generation of the prefix header, cotire will automatically choose headers used by the -target that are outside of the project directory and thus are likely to change infrequently. -The precompiled prefix header is then applied to the target to speed up the compilation process. - -To use an existing manually maintained prefix header instead of the automatically generated one, -set the `COTIRE_CXX_PREFIX_HEADER_INIT` property before invoking cotire: - - set_target_properties(MyExecutable PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdafx.h") - cotire(MyExecutable) - -As a side effect, cotire generates a new target named `MyExecutable_unity`, which lets you perform -a unity build for the original target. The unity target inherits all build settings from the -original target, including linked library dependencies. - -For Makefile based generators you can then invoke a unity build that produces the same output as -the original target, but does so much faster by entering: - - $ make MyExecutable_unity - -See the advanced usage section of the [cotire manual][manual] for information on how to -configure the cotire process (e.g., how to make the unity build use all available processor -cores). - -The directory `Patches` contains patch files to enable cotire for some popular open sources -packages that use CMake as a build system. - -speedup -------- - -Depending on factors like hardware, compiler, the number of files in the target and the complexity -of the C/C++ code, the build process of targets that use a cotire generated precompiled header -will be sped up from 10 to 40 percent. Using precompiled headers however is not without -[issues][PCHH] and may not work for some programs. - -A unity build may be up to 90 percent faster than the one file at a time build of the original -target. Single compilation unit builds however are very unlikely to work without source code -modifications, because they [break][EoUB] the use of some C and C++ language features. - -Generally, modern C++ code which makes heavy use of header-only libraries will profit the most from -cotiring. - -This [blog post][shrp] discusses speedup results obtained for real-world projects. - -known issues ------------- - -* CMake configure time will increase for cotired targets. -* The size of the CMake build folder will increase, because precompiled headers are large binaries. -* It is not possible to share precompiled headers generated by cotire between CMake targets. - Multiple targets can share a generated prefix header, though (see the [cotire manual][manual]). -* Cotire is not compatible with [Xoreax IncrediBuild][XGE]. - -[ccch]:https://ccache.samba.org/ -[ccrc]:https://cmake.org/Wiki/CMake_Cross_Compiling -[cgwn]:https://www.cygwin.com/ -[clang]:https://clang.llvm.org/ -[cmk]:https://cmake.org/download/ -[gcc]:https://gcc.gnu.org/ -[manual]:https://github.com/sakra/cotire/blob/master/MANUAL.md -[mingw]:http://www.mingw.org/ -[ninja]:https://ninja-build.org/ -[pch]:https://en.wikipedia.org/wiki/Precompiled_header -[pfh]:https://en.wikipedia.org/wiki/Prefix_header -[scu]:https://en.wikipedia.org/wiki/Single_Compilation_Unit -[vslstd]:https://www.visualstudio.com/ -[xcdt]:https://developer.apple.com/xcode/ -[PCHH]:https://gcc.gnu.org/wiki/PCHHaters -[EoUB]:http://altdevblog.com/2011/08/14/the-evils-of-unity-builds/ -[jom]:https://wiki.qt.io/Jom -[intel]:https://software.intel.com/en-us/c-compilers -[XGE]:https://www.incredibuild.com/ -[shrp]:https://unriskinsight.blogspot.co.at/2014/09/sharpen-your-tools.html diff --git a/cotire/license b/cotire/license deleted file mode 100644 index 68c37ca2d..000000000 --- a/cotire/license +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) 2012-2018 Sascha Kratky - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. diff --git a/cotire/src/CMakeLists.txt b/cotire/src/CMakeLists.txt deleted file mode 100644 index 92df23355..000000000 --- a/cotire/src/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -# cotire example project - -add_executable(example main.cpp example.cpp log.cpp log.h example.h) - -# enable warnings -if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set_target_properties(example PROPERTIES COMPILE_FLAGS "-Weverything") -elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU") - set_target_properties(example PROPERTIES COMPILE_FLAGS "-Wall -Wextra") -endif() - -cotire(example) - -# cotire sets the following properties -get_target_property(_unitySource example COTIRE_CXX_UNITY_SOURCE) -get_target_property(_prefixHeader example COTIRE_CXX_PREFIX_HEADER) -get_target_property(_precompiledHeader example COTIRE_CXX_PRECOMPILED_HEADER) -get_target_property(_unityTargetName example COTIRE_UNITY_TARGET_NAME) - -if (_unitySource) - message(STATUS "example unity source: ${_unitySource}") -endif() -if (_prefixHeader) - message(STATUS "example prefix header: ${_prefixHeader}") -endif() -if (_precompiledHeader) - message(STATUS "example precompiled header: ${_precompiledHeader}") -endif() -if (TARGET ${_unityTargetName}) - message(STATUS "example unity target: ${_unityTargetName}") -endif() diff --git a/cotire/src/example.cpp b/cotire/src/example.cpp deleted file mode 100644 index a85731507..000000000 --- a/cotire/src/example.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// cotire example project - -#include "example.h" - -#ifndef NDEBUG -#include -#include -#endif - -namespace example { - -std::string get_message() { - char msg_chrs[] = { 'C', 'o', 't', 'i', 'r', 'e', 'd', '!' }; -#ifdef NDEBUG - return std::string(&msg_chrs[0], &msg_chrs[sizeof(msg_chrs)]); -#else - std::string msg; - msg.reserve(sizeof(msg_chrs)); - std::copy(msg_chrs, msg_chrs + sizeof(msg_chrs), std::back_inserter(msg)); - return msg; -#endif -} - -} diff --git a/cotire/src/example.h b/cotire/src/example.h deleted file mode 100644 index 0fe3e235c..000000000 --- a/cotire/src/example.h +++ /dev/null @@ -1,10 +0,0 @@ -// cotire example project - -#include - -namespace example { - -std::string get_message(); - -} - diff --git a/cotire/src/log.cpp b/cotire/src/log.cpp deleted file mode 100644 index 5294adb82..000000000 --- a/cotire/src/log.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// cotire example project - -#include "log.h" - -#include - -namespace logging { - -void error(const std::string& msg) { - std::cerr << msg << std::endl; -} - -void info(const std::string& msg) { - std::cout << msg << std::endl; -} - -} diff --git a/cotire/src/log.h b/cotire/src/log.h deleted file mode 100644 index a6ce24a1e..000000000 --- a/cotire/src/log.h +++ /dev/null @@ -1,10 +0,0 @@ -// cotire example project - -#include - -namespace logging { - -void error(const std::string& msg); -void info(const std::string& msg); - -} diff --git a/cotire/src/main.cpp b/cotire/src/main.cpp deleted file mode 100644 index 2ea1af621..000000000 --- a/cotire/src/main.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// cotire example project main - -#include - -#include "example.h" -#include "log.h" - -int main() -{ - std::string msg = example::get_message(); - logging::info(msg); -}