diff options
-rw-r--r-- | CMakeLists.txt | 10 | ||||
-rw-r--r-- | codecs/codecs.h | 2 | ||||
-rw-r--r-- | ui/qt/byte_view_tab.h | 2 | ||||
-rw-r--r-- | ui/qt/capture_file.h | 2 | ||||
-rw-r--r-- | ui/qt/capture_file_properties_dialog.h | 2 | ||||
-rw-r--r-- | ui/qt/capture_interfaces_dialog.h | 2 | ||||
-rw-r--r-- | ui/qt/file_set_dialog.h | 2 | ||||
-rw-r--r-- | ui/qt/follow_stream_dialog.h | 2 | ||||
-rw-r--r-- | ui/qt/interface_tree.h | 2 | ||||
-rw-r--r-- | ui/qt/main_window.h | 2 | ||||
-rw-r--r-- | ui/qt/packet_list_model.h | 2 | ||||
-rw-r--r-- | ui/qt/packet_list_record.h | 2 | ||||
-rw-r--r-- | ui/qt/preferences_dialog.h | 2 | ||||
-rw-r--r-- | ui/qt/proto_tree.h | 2 | ||||
-rw-r--r-- | ui/qt/related_packet_delegate.h | 2 | ||||
-rw-r--r-- | ui/qt/simple_dialog.h | 2 | ||||
-rw-r--r-- | ui/qt/splash_overlay.h | 2 | ||||
-rw-r--r-- | ui/qt/traffic_table_dialog.h | 2 | ||||
-rw-r--r-- | ui/qt/wireshark_application.h | 2 | ||||
-rw-r--r-- | wireshark-qt.cpp | 6 |
20 files changed, 21 insertions, 31 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d8f7c2532..125d3008fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -915,16 +915,6 @@ endif() set( VERSION ${PROJECT_VERSION} ) set( configure_input "Built with CMake ${CMAKE_VERSION}" ) configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h) - -if(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") - # Try to run before anything else. Ideally we'd just use add_custom_command(... PRE_BUILD) - # but that only works for Visual Studio. As it is this likely has a race condition. - add_custom_target(clean_other_build_system_conflicts ALL - COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_SOURCE_DIR}/config.h - DEPENDS ${CMAKE_BINARY_DIR}/config.h ${CMAKE_BINARY_DIR}/version.h - ) -endif() - set( IN_FILES adns_dll.rc capchild/doxygen.cfg.in diff --git a/codecs/codecs.h b/codecs/codecs.h index 794cd32b63..80d0d71e2f 100644 --- a/codecs/codecs.h +++ b/codecs/codecs.h @@ -23,7 +23,7 @@ #ifndef _CODECS_H_ #define _CODECS_H_ -#include "config.h" +#include <config.h> #include <epan/epan.h> #include "ws_symbol_export.h" diff --git a/ui/qt/byte_view_tab.h b/ui/qt/byte_view_tab.h index 82aaed340e..c36931a881 100644 --- a/ui/qt/byte_view_tab.h +++ b/ui/qt/byte_view_tab.h @@ -22,7 +22,7 @@ #ifndef BYTE_VIEW_TAB_H #define BYTE_VIEW_TAB_H -#include "config.h" +#include <config.h> #include <epan/packet.h> #include <epan/proto.h> diff --git a/ui/qt/capture_file.h b/ui/qt/capture_file.h index 08f51385a3..3a4742e312 100644 --- a/ui/qt/capture_file.h +++ b/ui/qt/capture_file.h @@ -24,7 +24,7 @@ #include <QObject> -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/ui/qt/capture_file_properties_dialog.h b/ui/qt/capture_file_properties_dialog.h index 09272a4994..0581a80686 100644 --- a/ui/qt/capture_file_properties_dialog.h +++ b/ui/qt/capture_file_properties_dialog.h @@ -24,7 +24,7 @@ #ifndef CAPTURE_FILE_PROPERTIES_DIALOG_H #define CAPTURE_FILE_PROPERTIES_DIALOG_H -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/ui/qt/capture_interfaces_dialog.h b/ui/qt/capture_interfaces_dialog.h index 5ec54d7f6a..89639cdfcf 100644 --- a/ui/qt/capture_interfaces_dialog.h +++ b/ui/qt/capture_interfaces_dialog.h @@ -23,7 +23,7 @@ #ifndef CAPTURE_INTERFACES_DIALOG_H #define CAPTURE_INTERFACES_DIALOG_H -#include "config.h" +#include <config.h> #ifdef HAVE_LIBPCAP diff --git a/ui/qt/file_set_dialog.h b/ui/qt/file_set_dialog.h index f8bbe47055..227bf6d19f 100644 --- a/ui/qt/file_set_dialog.h +++ b/ui/qt/file_set_dialog.h @@ -22,7 +22,7 @@ #ifndef FILE_SET_DIALOG_H #define FILE_SET_DIALOG_H -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/ui/qt/follow_stream_dialog.h b/ui/qt/follow_stream_dialog.h index 107767d446..aa49b16537 100644 --- a/ui/qt/follow_stream_dialog.h +++ b/ui/qt/follow_stream_dialog.h @@ -22,7 +22,7 @@ #ifndef FOLLOW_STREAM_DIALOG_H #define FOLLOW_STREAM_DIALOG_H -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/ui/qt/interface_tree.h b/ui/qt/interface_tree.h index 48b5b5acd9..33c8ed2f19 100644 --- a/ui/qt/interface_tree.h +++ b/ui/qt/interface_tree.h @@ -22,7 +22,7 @@ #ifndef INTERFACE_TREE_H #define INTERFACE_TREE_H -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index a31eeaeea7..3047f27290 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -24,7 +24,7 @@ #include <stdio.h> -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/ui/qt/packet_list_model.h b/ui/qt/packet_list_model.h index 9c22be5daa..fedde05149 100644 --- a/ui/qt/packet_list_model.h +++ b/ui/qt/packet_list_model.h @@ -22,7 +22,7 @@ #ifndef PACKET_LIST_MODEL_H #define PACKET_LIST_MODEL_H -#include "config.h" +#include <config.h> #include <stdio.h> diff --git a/ui/qt/packet_list_record.h b/ui/qt/packet_list_record.h index 5eefa3ff5f..af2b251eb4 100644 --- a/ui/qt/packet_list_record.h +++ b/ui/qt/packet_list_record.h @@ -22,7 +22,7 @@ #ifndef PACKET_LIST_RECORD_H #define PACKET_LIST_RECORD_H -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h index 1e08d53954..baa17f12af 100644 --- a/ui/qt/preferences_dialog.h +++ b/ui/qt/preferences_dialog.h @@ -22,7 +22,7 @@ #ifndef PREFERENCES_DIALOG_H #define PREFERENCES_DIALOG_H -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/ui/qt/proto_tree.h b/ui/qt/proto_tree.h index 54d081bd4d..66426f4aef 100644 --- a/ui/qt/proto_tree.h +++ b/ui/qt/proto_tree.h @@ -22,7 +22,7 @@ #ifndef PROTO_TREE_H #define PROTO_TREE_H -#include "config.h" +#include <config.h> #include <epan/proto.h> diff --git a/ui/qt/related_packet_delegate.h b/ui/qt/related_packet_delegate.h index e1a6bcc4a6..db8b1a617a 100644 --- a/ui/qt/related_packet_delegate.h +++ b/ui/qt/related_packet_delegate.h @@ -22,7 +22,7 @@ #ifndef RELATED_PACKET_DELEGATE_H #define RELATED_PACKET_DELEGATE_H -#include "config.h" +#include <config.h> #include "epan/conversation.h" diff --git a/ui/qt/simple_dialog.h b/ui/qt/simple_dialog.h index 98ab98598a..2185a9c0dd 100644 --- a/ui/qt/simple_dialog.h +++ b/ui/qt/simple_dialog.h @@ -22,7 +22,7 @@ #ifndef SIMPLE_DIALOG_H #define SIMPLE_DIALOG_H -#include "config.h" +#include <config.h> #include <stdio.h> diff --git a/ui/qt/splash_overlay.h b/ui/qt/splash_overlay.h index 775e8f6080..4fc6631b7c 100644 --- a/ui/qt/splash_overlay.h +++ b/ui/qt/splash_overlay.h @@ -22,7 +22,7 @@ #ifndef SPLASH_OVERLAY_H #define SPLASH_OVERLAY_H -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/ui/qt/traffic_table_dialog.h b/ui/qt/traffic_table_dialog.h index aac88a40ea..e8b6ba39fb 100644 --- a/ui/qt/traffic_table_dialog.h +++ b/ui/qt/traffic_table_dialog.h @@ -22,7 +22,7 @@ #ifndef TRAFFIC_TABLE_DIALOG_H #define TRAFFIC_TABLE_DIALOG_H -#include "config.h" +#include <config.h> #include "file.h" diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h index 48f729cbc5..f66a926e09 100644 --- a/ui/qt/wireshark_application.h +++ b/ui/qt/wireshark_application.h @@ -22,7 +22,7 @@ #ifndef WIRESHARK_APPLICATION_H #define WIRESHARK_APPLICATION_H -#include "config.h" +#include <config.h> #include <glib.h> diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp index 1bd2f6d61b..f8b708032b 100644 --- a/wireshark-qt.cpp +++ b/wireshark-qt.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#include <config.h> #include <glib.h> @@ -28,7 +28,7 @@ #endif #ifdef HAVE_LIBZ -#include <zlib.h> /* to get the libz version number */ +#include <zlib.h> /* to get the libz version number */ #endif #ifdef HAVE_GETOPT_H @@ -407,7 +407,7 @@ int main(int argc, char *argv[]) gboolean arg_error = FALSE; #ifdef _WIN32 - WSADATA wsaData; + WSADATA wsaData; #endif /* _WIN32 */ char *rf_path; |