diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2018-08-22 01:45:45 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2018-08-22 00:49:16 +0000 |
| commit | 7d76d0ce289f77b7e9c9774fe4cb321b350ddf64 (patch) | |
| tree | 8e7aa9aa78ee18ac92592ed3cfef2522cfe1cb44 /cmake | |
| parent | 60e87794c442867d721631d7ed965e339f8ebb7c (diff) | |
Revert "CMake: Clean up plugin dirs"
Broke system (global) binary plugin path.
This reverts commit 450ff674a6e84c3abebff76a470d72114083f27f.
Change-Id: I5353d2f3acf4450aed243040ef71425a71542a08
Reviewed-on: https://code.wireshark.org/review/29240
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/WiresharkConfig.cmake.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmake/modules/WiresharkConfig.cmake.in b/cmake/modules/WiresharkConfig.cmake.in index b3ef32f4aa..c3f4edfb6d 100644 --- a/cmake/modules/WiresharkConfig.cmake.in +++ b/cmake/modules/WiresharkConfig.cmake.in @@ -5,8 +5,7 @@ set(Wireshark_VERSION @PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_P set(Wireshark_VERSION_STRING "@PROJECT_MAJOR_VERSION@.@PROJECT_MINOR_VERSION@.@PROJECT_PATCH_VERSION@") set(Wireshark_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@") -set(Wireshark_PLUGIN_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@/@PLUGIN_INSTALL_LIBDIR@") -set(Wireshark_EXTCAP_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@/@EXTCAP_INSTALL_LIBDIR@") +set(Wireshark_PLUGIN_INSTALL_DIR "@PLUGIN_INSTALL_DIR@") set(Wireshark_LIB_DIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@") set(Wireshark_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/wireshark") |