diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-05-24 15:08:48 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-05-24 13:58:13 +0000 |
| commit | 25a95709a1fe0151a9c1b600f5ea1866a953f211 (patch) | |
| tree | 48940a9cc20c0404ba2923f28b4fe7046434ee28 /extcap | |
| parent | 63025ae2e190567fdd4f92d31a886dac00de427e (diff) | |
extcap: set EXTCAP_DIR in the root cmake file and propagate it.
The EXTCAP_DIR must be known in the root file to be set in config.h
and it's still needed in extcap/ to install the binaries, hence we
need caching it as well.
Bug: 14724
Change-Id: I58bac7de7a00e06c23fe8c8f1a7e3d299de6a560
Reviewed-on: https://code.wireshark.org/review/27776
Reviewed-by: Mikael Kanstrup <mikael.kanstrup@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/CMakeLists.txt | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/extcap/CMakeLists.txt b/extcap/CMakeLists.txt index f79a27d2ff..242f66d434 100644 --- a/extcap/CMakeLists.txt +++ b/extcap/CMakeLists.txt @@ -11,17 +11,6 @@ if(EXTCAP_ANDROIDDUMP_LIBPCAP) set(ANDROIDDUMP_USE_LIBPCAP 1) endif() -# Target platform locations -# UN*X in general, including macOS if not building an app bundle: -# $DESTDIR/lib/wireshark/extcap -# Windows: $DESTDIR/extcap -# macOS app bundle: Wireshark.app/Contents/Resources/share/wireshark/extcap -if (WIN32) - set(EXTCAP_DIR "extcap") -else () - set(EXTCAP_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${CPACK_PACKAGE_NAME}/extcap") -endif() - if(LIBSSH_FOUND) SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBSSH_LIBRARIES}) CHECK_FUNCTION_EXISTS(ssh_userauth_agent LIBSSH_USERAUTH_AGENT_FOUND) |