From 7522497b67ca259e08c9d2c990437c0c0afb9955 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 20 Oct 2014 22:29:11 -0700 Subject: [PATCH] With CMake, define WANT_PACKET_EDITOR in config.h. Just as we do with autotools and nmake, define it in config.h, so it's defined the same for every single file, rather than defining it in one particular directory's Makefiles, so that it's defined for some code but not all. Change-Id: Ic41cd10f2b502e0be76c134cbeaad94dff7623f8 Reviewed-on: https://code.wireshark.org/review/4891 Reviewed-by: Guy Harris --- cmakeconfig.h.in | 3 +++ ui/gtk/CMakeLists.txt | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index fe7b916be1..326818e086 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -371,6 +371,9 @@ /* Define if we have QtWinExtras */ /* #cmakedefine QT_WINEXTRAS_LIB 1 */ +/* Support for packet editor */ +#cmakedefine WANT_PACKET_EDITOR 1 + /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ #cmakedefine WORDS_BIGENDIAN 1 diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt index 92acf2de09..553f3fb36a 100644 --- a/ui/gtk/CMakeLists.txt +++ b/ui/gtk/CMakeLists.txt @@ -235,12 +235,6 @@ else() ) endif() -if (WANT_PACKET_EDITOR) - add_definitions( - -DWANT_PACKET_EDITOR - ) -endif() - if(WIN32) set(PLATFORM_UI_SRC capture_if_details_dlg_win32.c