osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

[Androiddump] Fix CMake install path for androiddump 

Changed path from "share" to one based on plugns path
For example /usr/local/lib/wireshark/extcap

Change-Id: I8f4a9f274b1cec897ed45de9e05679ac3f230301
Reviewed-on: https://code.wireshark.org/review/8161
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
This commit is contained in:
michal.orynicz 2015-04-21 11:08:19 +02:00 committed by Balint Reczey
parent 847e5179dc
commit 448e122ea5
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -945,16 +945,17 @@ else()
endif()
set (DATAFILE_DIR ${_datafile_dir} CACHE INTERNAL "Build time data file location.")
if(ENABLE_EXTCAP)
set(HAVE_EXTCAP 1)
set(EXTCAP_DIR "${DATAFILE_DIR}/extcap/")
endif()
if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
set(ABSOLUTE_CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
else()
set(ABSOLUTE_CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
endif()
if(ENABLE_EXTCAP)
set(HAVE_EXTCAP 1)
set(EXTCAP_DIR "${ABSOLUTE_CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/extcap/")
endif()
# Location of our plugins. PLUGIN_DIRECTORY should allow running
# from the build directory similar to DATAFILE_DIR above.
if(ENABLE_PLUGINS)

2
cmakeconfig.h.in
View File

@ -23,7 +23,7 @@
#cmakedefine HAVE_SSE4_2 1
/* Directory where extcap hooks reside */
#define EXTCAP_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/extcap/"
#define EXTCAP_DIR "${EXTCAP_DIR}"
/* Define to 1 if we want to enable extcap */
#cmakedefine HAVE_EXTCAP 1