diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-07-03 10:16:25 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-07-03 17:16:54 +0000 |
commit | 06bd8045d75793f21a344fdbf9dd827229c6ec20 (patch) | |
tree | b1c0c5556362d503b791283e5e52345c0832e994 /CMakeLists.txt | |
parent | 66b02c75eda0c5c7430ff62f641390ad415e826c (diff) |
Make wsutil depend on gitversion.
wsutil contains the only code that uses version.h; make the dependency
explicit, to see whether that fixes the current build issues with Debian
packaging.
Also, get rid of all *other* dependencies on gitversion.
Change-Id: I89fa5e4112633b83a1a7dfa349bc337e3688575f
Reviewed-on: https://code.wireshark.org/review/2823
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bf6691d231..16572792a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1071,7 +1071,6 @@ if(BUILD_wireshark AND GTK_FOUND) # qtshark and wireshark share wireshark_FILES add_executable(wireshark ${wireshark_FILES}) - add_dependencies(wireshark gitversion) set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(wireshark PROPERTIES FOLDER "Executables") target_link_libraries(wireshark ${wireshark_LIBS}) @@ -1095,7 +1094,6 @@ if(BUILD_qtshark AND QT_FOUND) # qtshark and wireshark share wireshark_FILES add_executable(qtshark ${wireshark_FILES}) - add_dependencies(qtshark gitversion) set_target_properties(qtshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(qtshark PROPERTIES FOLDER "Executables") target_link_libraries(qtshark ${qtshark_LIBS}) @@ -1125,7 +1123,6 @@ if(BUILD_tshark) image/tshark.rc ) add_executable(tshark ${tshark_FILES}) - add_dependencies(tshark gitversion) set_target_properties(tshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(tshark PROPERTIES FOLDER "Executables") target_link_libraries(tshark ${tshark_LIBS}) @@ -1147,7 +1144,6 @@ if(BUILD_tfshark) image/tfshark.rc ) add_executable(tfshark ${tfshark_FILES}) - add_dependencies(tfshark gitversion) set_target_properties(tfshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(tfshark PROPERTIES FOLDER "Executables") target_link_libraries(tfshark ${tfshark_LIBS}) @@ -1167,7 +1163,6 @@ if(BUILD_rawshark AND PCAP_FOUND) image/rawshark.rc ) add_executable(rawshark ${rawshark_FILES}) - add_dependencies(rawshark gitversion) set_target_properties(rawshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(rawshark PROPERTIES FOLDER "Executables") target_link_libraries(rawshark ${rawshark_LIBS}) @@ -1230,7 +1225,6 @@ if(BUILD_text2pcap) text2pcap-scanner.l ) add_executable(text2pcap ${text2pcap_FILES}) - add_dependencies(text2pcap gitversion) set_target_properties(text2pcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(text2pcap PROPERTIES FOLDER "Executables") target_link_libraries(text2pcap ${text2pcap_LIBS}) @@ -1249,7 +1243,6 @@ if(BUILD_mergecap) image/mergecap.rc ) add_executable(mergecap ${mergecap_FILES}) - add_dependencies(mergecap gitversion) set_target_properties(mergecap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(mergecap PROPERTIES FOLDER "Executables") target_link_libraries(mergecap ${mergecap_LIBS}) @@ -1268,7 +1261,6 @@ if(BUILD_reordercap) image/reordercap.rc ) add_executable(reordercap ${reordercap_FILES}) - add_dependencies(reordercap gitversion) set_target_properties(reordercap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(reordercap PROPERTIES FOLDER "Executables") target_link_libraries(reordercap ${reordercap_LIBS}) @@ -1289,7 +1281,6 @@ if(BUILD_capinfos) image/capinfos.rc ) add_executable(capinfos ${capinfos_FILES}) - add_dependencies(capinfos gitversion) set_target_properties(capinfos PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(capinfos PROPERTIES FOLDER "Executables") target_link_libraries(capinfos ${capinfos_LIBS}) @@ -1309,7 +1300,6 @@ if(BUILD_captype) image/captype.rc ) add_executable(captype ${captype_FILES}) - add_dependencies(captype gitversion) set_target_properties(captype PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(captype PROPERTIES FOLDER "Executables") target_link_libraries(captype ${captype_LIBS}) @@ -1328,7 +1318,6 @@ if(BUILD_editcap) image/editcap.rc ) add_executable(editcap ${editcap_FILES}) - add_dependencies(editcap gitversion) set_target_properties(editcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(editcap PROPERTIES FOLDER "Executables") target_link_libraries(editcap ${editcap_LIBS}) @@ -1364,7 +1353,6 @@ if(BUILD_dumpcap AND PCAP_FOUND) image/dumpcap.rc ) add_executable(dumpcap ${dumpcap_FILES}) - add_dependencies(dumpcap gitversion) set_target_properties(dumpcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") set_target_properties(dumpcap PROPERTIES FOLDER "Executables") target_link_libraries(dumpcap ${dumpcap_LIBS}) |