Commit cdb48e8e authored by David E. DeMarle's avatar David E. DeMarle

Merge branch 'master' into 'master'

Preventing TIFF tests from building when TIFF isn't found

@demarle 

To fix: https://open.cdash.org/viewBuildError.php?buildid=4414462 

See merge request !10
parents 83bf32b7 33def086
...@@ -23,7 +23,9 @@ ADD_TEST_C(CTestXdmfAggregate) ...@@ -23,7 +23,9 @@ ADD_TEST_C(CTestXdmfAggregate)
ADD_TEST_C(CTestXdmfAttribute) ADD_TEST_C(CTestXdmfAttribute)
ADD_TEST_C(CTestXdmfBinaryController) ADD_TEST_C(CTestXdmfBinaryController)
ADD_TEST_C(CTestXdmfDomain) ADD_TEST_C(CTestXdmfDomain)
ADD_TEST_C(CTestXdmfTIFFReadWriteCompressed) if (TIFF_FOUND)
ADD_TEST_C(CTestXdmfTIFFReadWriteCompressed)
endif ()
ADD_TEST_C(CTestXdmfTopology) ADD_TEST_C(CTestXdmfTopology)
ADD_TEST_C(CTestXdmfGeometry) ADD_TEST_C(CTestXdmfGeometry)
ADD_TEST_C(CTestXdmfGraph) ADD_TEST_C(CTestXdmfGraph)
...@@ -61,8 +63,10 @@ CLEAN_TEST_C(CTestXdmfBinaryController ...@@ -61,8 +63,10 @@ CLEAN_TEST_C(CTestXdmfBinaryController
CLEAN_TEST_C(CTestXdmfDomain CLEAN_TEST_C(CTestXdmfDomain
domainfile.xmf domainfile.xmf
domainfile.h5) domainfile.h5)
CLEAN_TEST_C(CTestXdmfTIFFReadWriteCompressed if (TIFF_FOUND)
compressedstripoutput.tif) CLEAN_TEST_C(CTestXdmfTIFFReadWriteCompressed
compressedstripoutput.tif)
endif ()
CLEAN_TEST_C(CTestXdmfTopology CLEAN_TEST_C(CTestXdmfTopology
topofile.xmf topofile.xmf
topofile.h5) topofile.h5)
......
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