diff options
author | Gerald Combs <gerald@wireshark.org> | 2018-03-07 11:35:33 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2018-03-07 23:27:06 +0000 |
commit | 39a65995ccaa45322b7ee870fe21a0daa6157242 (patch) | |
tree | f49835f5cb69dcb1510eaad6865570ea1e327056 /epan/CMakeLists.txt | |
parent | eefa76a7c810bd74d95d571362f0ad5fda691e70 (diff) |
CMake: Exclude test targets from the default build.
For the Visual Studio generator, setting the EXCLUDE_FROM_ALL property on
a target excludes it from ALL_BUILD.vcxproj, but we additionally need
to set EXCLUDE_FROM_DEFAULT_BUILD to exclude it from Wireshark.sln.
Do so for the test targets.
Change-Id: Icd328f75d4927e5b7bb65b1833da4724f63476b6
Reviewed-on: https://code.wireshark.org/review/26345
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/CMakeLists.txt')
-rw-r--r-- | epan/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 589cf94804..603923753a 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -395,6 +395,7 @@ add_executable(exntest EXCLUDE_FROM_ALL exntest.c except.c) target_link_libraries(exntest ${GLIB2_LIBRARIES}) set_target_properties(exntest PROPERTIES FOLDER "Tests" + EXCLUDE_FROM_DEFAULT_BUILD True COMPILE_DEFINITIONS "WS_BUILD_DLL" ) @@ -402,6 +403,7 @@ add_executable(oids_test EXCLUDE_FROM_ALL oids_test.c) target_link_libraries(oids_test epan ${ZLIB_LIBRARIES}) set_target_properties(oids_test PROPERTIES FOLDER "Tests" + EXCLUDE_FROM_DEFAULT_BUILD True COMPILE_DEFINITIONS "WS_BUILD_DLL" ) @@ -409,12 +411,14 @@ add_executable(reassemble_test EXCLUDE_FROM_ALL reassemble_test.c) target_link_libraries(reassemble_test epan) set_target_properties(reassemble_test PROPERTIES FOLDER "Tests" + EXCLUDE_FROM_DEFAULT_BUILD True ) add_executable(tvbtest EXCLUDE_FROM_ALL tvbtest.c) target_link_libraries(tvbtest epan) set_target_properties(tvbtest PROPERTIES FOLDER "Tests" + EXCLUDE_FROM_DEFAULT_BUILD True COMPILE_DEFINITIONS "WS_BUILD_DLL" ) |