Commit c0d088b9 authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'mesh_tests_dont_hard_require_discrete_model'

05d862b5 Conditionally build smtk::mesh tests that require discrete model.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !358
parents 7f5baec5 05d862b5
......@@ -32,7 +32,7 @@ set(unit_tests_which_require_data
UnitTestExtractField.cxx
UnitTestExtractTessellation.cxx
UnitTestExtractTessellationOfModel.cxx
UnitTestExtractOrderedTessellation.cxx
UnitTestLoadMesh.cxx
UnitTestMergeContactPoints.cxx
UnitTestMeshSet.cxx
......@@ -47,9 +47,19 @@ set(unit_tests_which_require_data
UnitTestWriteMesh.cxx
)
set(extra_libs)
if(SMTK_ENABLE_DISCRETE_SESSION)
list(APPEND unit_tests_which_require_data
UnitTestExtractOrderedTessellation.cxx
)
list(APPEND extra_libs
smtkDiscreteSession
)
endif()
smtk_unit_tests(
LABEL "Mesh"
SOURCES ${unit_tests}
SOURCES_REQUIRE_DATA ${unit_tests_which_require_data}
LIBRARIES smtkCore smtkDiscreteSession smtkCoreModelTesting ${Boost_LIBRARIES}
LIBRARIES smtkCore smtkCoreModelTesting ${extra_libs} ${Boost_LIBRARIES}
)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment