forked from osmocom/wireshark
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).
This commit is contained in:
João Valverde
Guy Harris
parent
3164d4a646
commit
50fdfda316
|
|
@ -2592,6 +2592,7 @@ if(BUILD_tshark)
|
|||
add_executable(tshark ${tshark_FILES})
|
||||
set_extra_executable_properties(tshark "Executables")
|
||||
target_link_libraries(tshark ${tshark_LIBS})
|
||||
target_link_options(tshark PRIVATE $<$<BOOL:${MINGW}>:-municode>)
|
||||
install(TARGETS tshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -2638,6 +2639,7 @@ if(BUILD_rawshark AND PCAP_FOUND)
|
|||
add_executable(rawshark ${rawshark_FILES})
|
||||
set_extra_executable_properties(rawshark "Executables")
|
||||
target_link_libraries(rawshark ${rawshark_LIBS})
|
||||
target_link_options(rawshark PRIVATE $<$<BOOL:${MINGW}>:-municode>)
|
||||
install(TARGETS rawshark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -2704,6 +2706,7 @@ if(BUILD_randpkt)
|
|||
add_executable(randpkt ${randpkt_FILES})
|
||||
set_extra_executable_properties(randpkt "Executables")
|
||||
target_link_libraries(randpkt ${randpkt_LIBS})
|
||||
target_link_options(randpkt PRIVATE $<$<BOOL:${MINGW}>:-municode>)
|
||||
install(TARGETS randpkt RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -2731,6 +2734,7 @@ if(BUILD_text2pcap)
|
|||
add_executable(text2pcap ${text2pcap_FILES})
|
||||
set_extra_executable_properties(text2pcap "Executables")
|
||||
target_link_libraries(text2pcap ${text2pcap_LIBS})
|
||||
target_link_options(text2pcap PRIVATE $<$<BOOL:${MINGW}>:-municode>)
|
||||
install(TARGETS text2pcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -2750,6 +2754,7 @@ if(BUILD_mergecap)
|
|||
add_executable(mergecap ${mergecap_FILES})
|
||||
set_extra_executable_properties(mergecap "Executables")
|
||||
target_link_libraries(mergecap ${mergecap_LIBS})
|
||||
target_link_options(mergecap PRIVATE $<$<BOOL:${MINGW}>:-municode>)
|
||||
install(TARGETS mergecap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -2769,6 +2774,7 @@ if(BUILD_reordercap)
|
|||
add_executable(reordercap ${reordercap_FILES})
|
||||
set_extra_executable_properties(reordercap "Executables")
|
||||
target_link_libraries(reordercap ${reordercap_LIBS})
|
||||
target_link_options(reordercap PRIVATE $<$<BOOL:${MINGW}>:-municode>)
|
||||
install(TARGETS reordercap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -2791,6 +2797,7 @@ if(BUILD_capinfos)
|
|||
set_extra_executable_properties(capinfos "Executables")
|
||||
target_link_libraries(capinfos ${capinfos_LIBS})
|
||||
target_include_directories(capinfos SYSTEM PRIVATE ${GCRYPT_INCLUDE_DIRS})
|
||||
target_link_options(capinfos PRIVATE $<$<BOOL:${MINGW}>:-municode>)
|
||||
install(TARGETS capinfos RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -2811,6 +2818,7 @@ if(BUILD_captype)
|
|||
add_executable(captype ${captype_FILES})
|
||||
set_extra_executable_properties(captype "Executables")
|
||||
target_link_libraries(captype ${captype_LIBS})
|
||||
target_link_options(captype PRIVATE $<$<BOOL:${MINGW}>:-municode>)
|
||||
install(TARGETS captype RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -2832,6 +2840,7 @@ if(BUILD_editcap)
|
|||
set_extra_executable_properties(editcap "Executables")
|
||||
target_link_libraries(editcap ${editcap_LIBS})
|
||||
target_include_directories(editcap SYSTEM PRIVATE ${GCRYPT_INCLUDE_DIRS})
|
||||
target_link_options(editcap PRIVATE $<$<BOOL:${MINGW}>:-municode>)
|
||||
install(TARGETS editcap RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
|
|
@ -2862,6 +2871,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
|
|||
set_extra_executable_properties(dumpcap "Executables")
|
||||
target_link_libraries(dumpcap ${dumpcap_LIBS})
|
||||
target_include_directories(dumpcap SYSTEM PRIVATE ${ZLIB_INCLUDE_DIRS})
|
||||
target_link_options(dumpcap PRIVATE $<$<BOOL:${MINGW}>:-municode>)
|
||||
install(TARGETS dumpcap
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
PERMISSIONS ${DUMPCAP_SETUID}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue