diff options
| author | João Valverde <j@v6e.pt> | 2021-07-03 11:44:02 +0100 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2021-09-21 05:56:34 +0000 |
| commit | 50fdfda31679a8ce97a164d200af17ca87578204 (patch) | |
| tree | b5606a2ef356ec1a04a6a1e8b67a4ce0a1a330f7 /extcap | |
| parent | 3164d4a646f0226306b397f6721e58a5f66c7bff (diff) | |
| download | wireshark-50fdfda31679a8ce97a164d200af17ca87578204.tar.gz wireshark-50fdfda31679a8ce97a164d200af17ca87578204.tar.bz2 wireshark-50fdfda31679a8ce97a164d200af17ca87578204.zip | |
MinGW-w64: Need to link using -municode
Some targets are not using unicode/WinMain (not sure why), so this
really needs to be a per target setting (better anyway).
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/extcap/CMakeLists.txt b/extcap/CMakeLists.txt index 95263c491b..3f1a6d91eb 100644 --- a/extcap/CMakeLists.txt +++ b/extcap/CMakeLists.txt @@ -119,6 +119,7 @@ if(BUILD_androiddump) add_executable(androiddump ${androiddump_FILES}) set_extcap_executable_properties(androiddump) target_link_libraries(androiddump ${androiddump_LIBS}) + target_link_options(androiddump PRIVATE $<$<BOOL:${MINGW}>:-municode>) install(TARGETS androiddump RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) add_dependencies(extcaps androiddump) endif() @@ -141,6 +142,7 @@ if(BUILD_sshdump AND LIBSSH_FOUND) add_executable(sshdump ${sshdump_FILES}) set_extcap_executable_properties(sshdump) target_link_libraries(sshdump ${sshdump_LIBS}) + target_link_options(sshdump PRIVATE $<$<BOOL:${MINGW}>:-municode>) target_include_directories(sshdump SYSTEM PRIVATE ${LIBSSH_INCLUDE_DIRS}) install(TARGETS sshdump RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) add_dependencies(extcaps sshdump) @@ -167,6 +169,7 @@ if(BUILD_ciscodump AND LIBSSH_FOUND) add_executable(ciscodump ${ciscodump_FILES}) set_extcap_executable_properties(ciscodump) target_link_libraries(ciscodump ${ciscodump_LIBS}) + target_link_options(ciscodump PRIVATE $<$<BOOL:${MINGW}>:-municode>) target_include_directories(ciscodump SYSTEM PRIVATE ${LIBSSH_INCLUDE_DIRS}) install(TARGETS ciscodump RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) add_dependencies(extcaps ciscodump) @@ -190,6 +193,7 @@ if(BUILD_dpauxmon AND HAVE_LIBNL3) add_executable(dpauxmon ${dpauxmon_FILES}) set_extcap_executable_properties(dpauxmon) target_link_libraries(dpauxmon ${dpauxmon_LIBS}) + target_link_options(dpauxmon PRIVATE $<$<BOOL:${MINGW}>:-municode>) target_include_directories(dpauxmon SYSTEM PRIVATE ${NL_INCLUDE_DIRS}) install(TARGETS dpauxmon RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) add_dependencies(extcaps dpauxmon) @@ -215,6 +219,7 @@ if(BUILD_udpdump) add_executable(udpdump ${udpdump_FILES}) set_extcap_executable_properties(udpdump) target_link_libraries(udpdump ${udpdump_LIBS}) + target_link_options(udpdump PRIVATE $<$<BOOL:${MINGW}>:-municode>) install(TARGETS udpdump RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) add_dependencies(extcaps udpdump) endif() @@ -238,6 +243,7 @@ if(BUILD_randpktdump) add_executable(randpktdump ${randpktdump_FILES}) set_extcap_executable_properties(randpktdump) target_link_libraries(randpktdump ${randpktdump_LIBS}) + target_link_options(randpktdump PRIVATE $<$<BOOL:${MINGW}>:-municode>) install(TARGETS randpktdump RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) add_dependencies(extcaps randpktdump) endif() @@ -289,6 +295,7 @@ if(BUILD_sdjournal AND SYSTEMD_FOUND) add_executable(sdjournal ${sdjournal_FILES}) set_extcap_executable_properties(sdjournal) target_link_libraries(sdjournal ${sdjournal_LIBS}) + target_link_options(sdjournal PRIVATE $<$<BOOL:${MINGW}>:-municode>) target_include_directories(sdjournal SYSTEM PRIVATE ${SYSTEMD_INCLUDE_DIRS}) install(TARGETS sdjournal RUNTIME DESTINATION ${EXTCAP_INSTALL_LIBDIR}) add_dependencies(extcaps sdjournal) |