aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGraham Bloice <graham.bloice@trihedral.com>2014-06-25 00:05:08 +0100
committerGraham Bloice <graham.bloice@trihedral.com>2014-06-26 21:34:38 +0000
commit4742fc8ed25f64822c711610e847298600319282 (patch)
treeedb2b6604a07de89319de2fa4ea9dc8e132d3ac3 /epan
parentc9b03b424f708b6f89bd9b95e8c1e28f9626c39d (diff)
Fixed linker flags for MSVC to not attempt to make and link a manifest
Added solution "folder" for tests. Change-Id: I96dfb4a28fb7aaf3e84cea026e1f5d15afe6c0c6 Reviewed-on: https://code.wireshark.org/review/2635 Tested-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 018e59c6c2..eb54e170ff 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1732,18 +1732,23 @@ endif()
add_executable(wmem_test wmem/wmem_test.c ${WMEM_FILES})
target_link_libraries(wmem_test ${GLIB2_LIBRARIES})
+set_target_properties(wmem_test PROPERTIES FOLDER "Tests")
add_executable(exntest exntest.c except.c)
target_link_libraries(exntest ${GLIB2_LIBRARIES})
+set_target_properties(exntest PROPERTIES FOLDER "Tests")
add_executable(oids_test oids_test.c)
target_link_libraries(oids_test epan)
+set_target_properties(oids_test PROPERTIES FOLDER "Tests")
add_executable(reassemble_test reassemble_test.c)
target_link_libraries(reassemble_test epan)
+set_target_properties(reassemble_test PROPERTIES FOLDER "Tests")
add_executable(tvbtest tvbtest.c)
target_link_libraries(tvbtest epan)
+set_target_properties(tvbtest PROPERTIES FOLDER "Tests")
#
# Editor modelines - http://www.wireshark.org/tools/modelines.html