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

Fix global plugin folder when it is set as an absolute path 

This fixes regression in creating Debian packages caused by
80b36cdbde

Change-Id: I46702ad4c9a11ce317da7ef664c84e1f22d3f709
Reviewed-on: https://code.wireshark.org/review/5316
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
This commit is contained in:
Balint Reczey 2014-11-14 21:39:00 +01:00
parent 6fbcc18742
commit bcc4c7fad6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -792,7 +792,11 @@ ADD_CUSTOM_COMMAND(
if(ENABLE_PLUGINS)
set(HAVE_PLUGINS 1)
set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}")
if(IS_ABSOLUTE ${CMAKE_INSTALL_LIBDIR})
set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}")
else()
set(PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION}")
endif()
set(PLUGIN_SRC_DIRS
plugins/docsis
plugins/ethercat