diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2018-08-22 01:45:45 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2018-08-22 00:49:16 +0000 |
| commit | 7d76d0ce289f77b7e9c9774fe4cb321b350ddf64 (patch) | |
| tree | 8e7aa9aa78ee18ac92592ed3cfef2522cfe1cb44 /extcap | |
| parent | 60e87794c442867d721631d7ed965e339f8ebb7c (diff) | |
Revert "CMake: Clean up plugin dirs"
Broke system (global) binary plugin path.
This reverts commit 450ff674a6e84c3abebff76a470d72114083f27f.
Change-Id: I5353d2f3acf4450aed243040ef71425a71542a08
Reviewed-on: https://code.wireshark.org/review/29240
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extcap/CMakeLists.txt b/extcap/CMakeLists.txt index 5ed2f7fcd3..0e8c95d69e 100644 --- a/extcap/CMakeLists.txt +++ b/extcap/CMakeLists.txt @@ -99,7 +99,7 @@ if(BUILD_androiddump) # XXX Shouldn't we add wsutil to androiddump_LIBS instead? set_extcap_executable_properties(androiddump) target_link_libraries(androiddump ${androiddump_LIBS}) - install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) + install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_DIR}) add_dependencies(extcaps androiddump) endif() @@ -120,7 +120,7 @@ if(BUILD_sshdump AND LIBSSH_FOUND) set_extcap_executable_properties(sshdump) target_link_libraries(sshdump ${sshdump_LIBS}) target_include_directories(sshdump PUBLIC ${LIBSSH_INCLUDE_DIR}) - install(TARGETS sshdump RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) + install(TARGETS sshdump RUNTIME DESTINATION ${EXTCAP_DIR}) add_dependencies(extcaps sshdump) elseif (BUILD_sshdump) #message( WARNING "Cannot find libssh, cannot build sshdump" ) @@ -144,7 +144,7 @@ if(BUILD_ciscodump AND LIBSSH_FOUND) set_extcap_executable_properties(ciscodump) target_link_libraries(ciscodump ${ciscodump_LIBS}) target_include_directories(ciscodump PUBLIC ${LIBSSH_INCLUDE_DIR}) - install(TARGETS ciscodump RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) + install(TARGETS ciscodump RUNTIME DESTINATION ${EXTCAP_DIR}) add_dependencies(extcaps ciscodump) elseif (BUILD_ciscodump) #message( WARNING "Cannot find libssh, cannot build ciscodump" ) @@ -167,7 +167,7 @@ if(BUILD_dpauxmon AND HAVE_LIBNL3) set_extcap_executable_properties(dpauxmon) target_link_libraries(dpauxmon ${dpauxmon_LIBS}) target_include_directories(dpauxmon PUBLIC ${NL_INCLUDE_DIR}) - install(TARGETS dpauxmon RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) + install(TARGETS dpauxmon RUNTIME DESTINATION ${EXTCAP_DIR}) add_dependencies(extcaps dpauxmon) elseif (BUILD_dpauxmon) #message( WARNING "Cannot find libnl3, cannot build dpauxmon" ) @@ -188,7 +188,7 @@ if(BUILD_udpdump) add_executable(udpdump WIN32 ${udpdump_FILES}) set_extcap_executable_properties(udpdump) target_link_libraries(udpdump ${udpdump_LIBS}) - install(TARGETS udpdump RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) + install(TARGETS udpdump RUNTIME DESTINATION ${EXTCAP_DIR}) add_dependencies(extcaps udpdump) endif() @@ -210,7 +210,7 @@ if(BUILD_randpktdump) # XXX Shouldn't we add wsutil to randpktdump_LIBS instead? set_extcap_executable_properties(randpktdump) target_link_libraries(randpktdump ${randpktdump_LIBS}) - install(TARGETS randpktdump RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) + install(TARGETS randpktdump RUNTIME DESTINATION ${EXTCAP_DIR}) add_dependencies(extcaps randpktdump) endif() @@ -219,4 +219,4 @@ set(CLEAN_C_FILES ${androiddump_FILES} ${sshdump_FILES} ${ciscodump_FILES} -) +)
\ No newline at end of file |