CMake: Set an output directory for plugins.

Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all
platforms. Add WiresharkPlugin.cmake so that we can start defining common
macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds.

Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2
Reviewed-on: https://code.wireshark.org/review/6640
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/wsutil/plugins.c b/wsutil/plugins.c
index aea9f811c4..18b4776da4 100644
--- a/wsutil/plugins.c
+++ b/wsutil/plugins.c
@@ -265,17 +265,17 @@ scan_plugins(void)
     {
         /*
          * Scan the global plugin directory.
-         * If we're running from a build directory, scan the subdirectories
-         * of that directory, as the global plugin directory is the
-         * "plugins" directory of the source tree, and the subdirectories
-         * are the source directories for the plugins, with the plugins
-         * built in those subdirectories.
+         * If we're running from a build directory, scan the "plugins"
+         * subdirectory, as that's where plugins are located in an
+         * out-of-tree build. If we find subdirectories scan those since
+         * they will contain plugins in the case of an in-tree build.
          */
         plugin_dir = get_plugin_dir();
         if (running_in_build_directory())
         {
             if ((dir = ws_dir_open(plugin_dir, 0, NULL)) != NULL)
             {
+                plugins_scan_dir(plugin_dir);
                 while ((file = ws_dir_read_name(dir)) != NULL)
                 {
                     name = ws_dir_get_name(file);