diff options
| author | Brad King <brad.king@kitware.com> | 2013-01-29 20:12:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-01-30 15:05:07 (GMT) |
| commit | 9e518a8169bae33c8a971c146e29b5af20114648 (patch) | |
| tree | 76b9f313e37f45dbe1b6f5172bbe4fe9bbb815fa /Tests/Module | |
| parent | 175ed02207ea5fe25aa7156acb2554d706611263 (diff) | |
| download | CMake-9e518a8169bae33c8a971c146e29b5af20114648.zip CMake-9e518a8169bae33c8a971c146e29b5af20114648.tar.gz CMake-9e518a8169bae33c8a971c146e29b5af20114648.tar.bz2 | |
ExternalData: Allow DATA{} syntax to reference directories
Use a trailing slash to reference a directory. Require that a list
of associated files be specified to select from within the directory.
One may simply use DATA{Dir/,REGEX:.*} to reference all files but
get a directory passed on the command line.
Diffstat (limited to 'Tests/Module')
| -rw-r--r-- | Tests/Module/ExternalData/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/Module/ExternalData/Data1Check.cmake | 6 | ||||
| -rw-r--r-- | Tests/Module/ExternalData/Directory/A.dat.md5 | 1 | ||||
| -rw-r--r-- | Tests/Module/ExternalData/Directory/B.dat.md5 | 1 | ||||
| -rw-r--r-- | Tests/Module/ExternalData/Directory/C.dat.md5 | 1 |
5 files changed, 10 insertions, 0 deletions
diff --git a/Tests/Module/ExternalData/CMakeLists.txt b/Tests/Module/ExternalData/CMakeLists.txt index 5532610..c9a192b 100644 --- a/Tests/Module/ExternalData/CMakeLists.txt +++ b/Tests/Module/ExternalData/CMakeLists.txt @@ -24,6 +24,7 @@ ExternalData_Add_Test(Data1 -D SeriesDn=DATA{SeriesDn-1.dat,:} -D Paired=DATA{PairedA.dat,PairedB.dat} -D Meta=DATA{MetaTop.dat,REGEX:Meta[ABC].dat} + -D Directory=DATA{Directory/,A.dat,REGEX:[BC].dat} -P ${CMAKE_CURRENT_SOURCE_DIR}/Data1Check.cmake ) ExternalData_Add_Target(Data1) diff --git a/Tests/Module/ExternalData/Data1Check.cmake b/Tests/Module/ExternalData/Data1Check.cmake index fd18cdf..972ec46 100644 --- a/Tests/Module/ExternalData/Data1Check.cmake +++ b/Tests/Module/ExternalData/Data1Check.cmake @@ -38,3 +38,9 @@ foreach(n Top A B C) message(SEND_ERROR "Input file:\n ${file}\ndoes not exist!") endif() endforeach() +foreach(n A B C) + set(file "${Directory}/${n}.dat") + if(NOT EXISTS "${file}") + message(SEND_ERROR "Input file:\n ${file}\ndoes not exist!") + endif() +endforeach() diff --git a/Tests/Module/ExternalData/Directory/A.dat.md5 b/Tests/Module/ExternalData/Directory/A.dat.md5 new file mode 100644 index 0000000..4a78fc7 --- /dev/null +++ b/Tests/Module/ExternalData/Directory/A.dat.md5 @@ -0,0 +1 @@ +9d980b06c2f0fec3d4872d68175b9822 diff --git a/Tests/Module/ExternalData/Directory/B.dat.md5 b/Tests/Module/ExternalData/Directory/B.dat.md5 new file mode 100644 index 0000000..4557a21 --- /dev/null +++ b/Tests/Module/ExternalData/Directory/B.dat.md5 @@ -0,0 +1 @@ +8f4add4581551facf27237e6577fd662 diff --git a/Tests/Module/ExternalData/Directory/C.dat.md5 b/Tests/Module/ExternalData/Directory/C.dat.md5 new file mode 100644 index 0000000..a7f23dd --- /dev/null +++ b/Tests/Module/ExternalData/Directory/C.dat.md5 @@ -0,0 +1 @@ +c1030719c95f3435d8abc39c0d442946 |