diff options
| author | Gerald Combs <gerald@zing.org> | 2015-01-18 13:27:13 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-20 16:12:20 +0000 |
| commit | 6e6a1291d0b36fe97d0f684e1abdfe546aaeae7f (patch) | |
| tree | e441c514c057d4cadd74ae21ec6cc321b63ef285 /plugins/ethercat | |
| parent | af3924a333aa8fc614ad45163751a614a9b9fc3d (diff) | |
| download | wireshark-6e6a1291d0b36fe97d0f684e1abdfe546aaeae7f.tar.gz | |
CMake: Set an output directory for plugins.
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all
platforms. Add WiresharkPlugin.cmake so that we can start defining common
macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds.
Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2
Reviewed-on: https://code.wireshark.org/review/6640
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'plugins/ethercat')
| -rw-r--r-- | plugins/ethercat/CMakeLists.txt | 43 |
1 files changed, 3 insertions, 40 deletions
diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt index 3b07a4407f..9d491ef4f0 100644 --- a/plugins/ethercat/CMakeLists.txt +++ b/plugins/ethercat/CMakeLists.txt @@ -19,29 +19,10 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# Create the Windows .rc file for the plugin. -# The values come from several files in the source, I can't see how to reuse them +include(WiresharkPlugin) # This info is from moduleinfo.nmake -set(PACKAGE ethercat) -set(MODULE_VERSION_MAJOR 0) -set(MODULE_VERSION_MINOR 1) -set(MODULE_VERSION_MICRO 0) -set(MODULE_VERSION_EXTRA 0) -set(MODULE_VERSION "${MODULE_VERSION_MAJOR}.${MODULE_VERSION_MINOR}.${MODULE_VERSION_MICRO}.${MODULE_VERSION_EXTRA}") -set(RC_MODULE_VERSION "${MODULE_VERSION_MAJOR},${MODULE_VERSION_MINOR},${MODULE_VERSION_MICRO},${MODULE_VERSION_EXTRA}") - -# This info is from Makefile.common -set(PLUGIN_NAME ${PACKAGE}) - -# This info is from config.nmake -set(MSVC_VARIANT "${CMAKE_GENERATOR}") - -# The rc.in requires a plain VERISON variable -set(VERSION ${PROJECT_VERSION}) - -# Create the plugin.rc file from the template -configure_file(plugin.rc.in plugin.rc @ONLY) +set_module_info(ethercat 0 1 0 0) set(DISSECTOR_SRC packet-ams.c @@ -77,28 +58,10 @@ register_dissector_files(plugin.c ${DISSECTOR_SRC} ) -add_library(ethercat ${LINK_MODE_MODULE} - ${PLUGIN_FILES} - ${CMAKE_CURRENT_BINARY_DIR}/plugin.rc -) - -set_target_properties(ethercat PROPERTIES - PREFIX "" - LINK_FLAGS "${WS_LINK_FLAGS}" - FOLDER "Plugins" -) - -if(ENABLE_APPLICATION_BUNDLE) - set_target_properties(ethercat PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/PlugIns/wireshark - ) -endif() - -target_link_libraries(ethercat epan) +add_plugin_library(ethercat) install(TARGETS ethercat LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} NAMELINK_SKIP RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} ) - |