diff options
| author | Gerald Combs <gerald@wireshark.org> | 2018-10-08 16:34:39 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2018-10-10 15:40:21 +0000 |
| commit | 573e8420027377cce79750b85f416c3b9a740968 (patch) | |
| tree | 621fb48b7128d83af549d6377258f3fefaebf895 /extcap/CMakeLists.txt | |
| parent | b7107f5fcb9bcc20be33b6263f90d1b20cc1591d (diff) | |
Windows: Make our program details more consistent.
Use a single template file for most of our program resources. Encode
our resource files as UTF-8. Add resources to extcap/*.exe.
Replace a regex with concatenation.
Change-Id: I0ed49086618127ca4fdef69272f849d8f16e4dab
Reviewed-on: https://code.wireshark.org/review/30088
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'extcap/CMakeLists.txt')
| -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 0c1daa6a14..de90d1d6d5 100644 --- a/extcap/CMakeLists.txt +++ b/extcap/CMakeLists.txt @@ -95,6 +95,7 @@ if(BUILD_androiddump) extcap-base.c ) + set_executable_resources(androiddump "Androiddump") add_executable(androiddump WIN32 ${androiddump_FILES}) # XXX Shouldn't we add wsutil to androiddump_LIBS instead? set_extcap_executable_properties(androiddump) @@ -116,6 +117,7 @@ if(BUILD_sshdump AND LIBSSH_FOUND) ssh-base.c ) + set_executable_resources(sshdump "Sshdump") add_executable(sshdump WIN32 ${sshdump_FILES}) set_extcap_executable_properties(sshdump) target_link_libraries(sshdump ${sshdump_LIBS}) @@ -140,6 +142,7 @@ if(BUILD_ciscodump AND LIBSSH_FOUND) ssh-base.c ) + set_executable_resources(ciscodump "Ciscodump") add_executable(ciscodump WIN32 ${ciscodump_FILES}) set_extcap_executable_properties(ciscodump) target_link_libraries(ciscodump ${ciscodump_LIBS}) @@ -163,6 +166,7 @@ if(BUILD_dpauxmon AND HAVE_LIBNL3) extcap-base.c ) + set_executable_resources(dpauxmon "dpauxmon") add_executable(dpauxmon WIN32 ${dpauxmon_FILES}) set_extcap_executable_properties(dpauxmon) target_link_libraries(dpauxmon ${dpauxmon_LIBS}) @@ -185,6 +189,7 @@ if(BUILD_udpdump) extcap-base.c ) + set_executable_resources(udpdump "udpdump") add_executable(udpdump WIN32 ${udpdump_FILES}) set_extcap_executable_properties(udpdump) target_link_libraries(udpdump ${udpdump_LIBS}) @@ -206,6 +211,7 @@ if(BUILD_randpktdump) randpktdump.c ) + set_executable_resources(randpktdump "randpktdump") add_executable(randpktdump WIN32 ${randpktdump_FILES}) # XXX Shouldn't we add wsutil to randpktdump_LIBS instead? set_extcap_executable_properties(randpktdump) @@ -230,6 +236,7 @@ if(BUILD_sdjournal AND SYSTEMD_FOUND) sdjournal.c ) + set_executable_resources(sdjournal "sdjournal") add_executable(sdjournal WIN32 ${sdjournal_FILES}) set_extcap_executable_properties(sdjournal) target_link_libraries(sdjournal ${sdjournal_LIBS}) |