diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2018-08-21 22:23:46 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2018-08-23 08:33:56 +0000 |
| commit | f0b41190eb965ac7c9b0084806f5797dc5ef7c8f (patch) | |
| tree | 4ad2bebfde95145b7a783d925fb277ea15ee0b7a /cmake | |
| parent | 0c0973196fb02e340732f0c4722ed50325a7fbf9 (diff) | |
CMake: Clean up and homogenize plugin dir configuration
Change-Id: If43c7b124afdf6471164675f8a0c55a76e998ea1
Reviewed-on: https://code.wireshark.org/review/29254
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/WiresharkConfig.cmake.in | 3 | ||||
| -rw-r--r-- | cmake/modules/WiresharkPlugin.cmake | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cmake/modules/WiresharkConfig.cmake.in b/cmake/modules/WiresharkConfig.cmake.in index c3f4edfb6d..17e8212b98 100644 --- a/cmake/modules/WiresharkConfig.cmake.in +++ b/cmake/modules/WiresharkConfig.cmake.in @@ -5,7 +5,8 @@ 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 "@PLUGIN_INSTALL_DIR@") +set(Wireshark_PLUGIN_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@/@PLUGIN_INSTALL_VERSION_LIBDIR@") +set(Wireshark_EXTCAP_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@/@EXTCAP_INSTALL_LIBDIR@") set(Wireshark_LIB_DIR "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@") set(Wireshark_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/wireshark") diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake index 38eb5d5a25..a406e4ef67 100644 --- a/cmake/modules/WiresharkPlugin.cmake +++ b/cmake/modules/WiresharkPlugin.cmake @@ -49,8 +49,8 @@ endmacro() macro(INSTALL_PLUGIN _plugin _subfolder) install(TARGETS ${_plugin} - LIBRARY DESTINATION ${PLUGIN_INSTALL_LIBDIR}/${_subfolder} NAMELINK_SKIP - RUNTIME DESTINATION ${PLUGIN_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${PLUGIN_INSTALL_LIBDIR} + LIBRARY DESTINATION ${PLUGIN_INSTALL_VERSION_LIBDIR}/${_subfolder} NAMELINK_SKIP + RUNTIME DESTINATION ${PLUGIN_INSTALL_VERSION_LIBDIR} + ARCHIVE DESTINATION ${PLUGIN_INSTALL_VERSION_LIBDIR} ) endmacro() |