diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2010-03-18 10:27:17 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2010-03-18 10:27:17 +0000 |
| commit | 96779de920fa5f308f29c35dce54d48e5d19b670 (patch) | |
| tree | 447b5cb2f49d91c4f87cd170ac0fe6f6b032117a /plugins/m2m | |
| parent | 1e0bcd0740f5c3f71a6e194d0f09deef0489d53d (diff) | |
| download | wireshark-96779de920fa5f308f29c35dce54d48e5d19b670.tar.gz wireshark-96779de920fa5f308f29c35dce54d48e5d19b670.tar.bz2 wireshark-96779de920fa5f308f29c35dce54d48e5d19b670.zip | |
cmake changes:
- Add checking for linker flags
- Install plugins with the name including the Wireshark version.
This will make it easier to find matching plugin versions if
files get just copied over.
svn path=/trunk/; revision=32231
Diffstat (limited to 'plugins/m2m')
| -rw-r--r-- | plugins/m2m/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt index 9878043c31..a067cfde43 100644 --- a/plugins/m2m/CMakeLists.txt +++ b/plugins/m2m/CMakeLists.txt @@ -58,12 +58,13 @@ add_library(m2m ${LINK_MODE_MODULE} ${PLUGIN_FILES} ) set_target_properties(m2m PROPERTIES PREFIX "") -#set_target_properties(m2m PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) +set_target_properties(m2m PROPERTIES SOVERSION ${CPACK_PACKAGE_VERSION}) +set_target_properties(m2m PROPERTIES LINK_FLAGS ${WS_LINK_FLAGS}) target_link_libraries(m2m epan) install(TARGETS m2m - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/@CPACK_PACKAGE_NAME@/plugins/${CPACK_PACKAGE_VERSION} + 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} ) |