diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-13 15:03:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-13 15:03:36 (GMT) |
| commit | 8eb20eeabeb2b0196723a3e6dcfbe0501dceb5e7 (patch) | |
| tree | 50534048d9c01fc54e03673199a19dd1759375bc /Tests/RunCMake/ExternalData | |
| parent | 558a6f1f920defdfcd7651fba3a85fded84d6a63 (diff) | |
| download | CMake-8eb20eeabeb2b0196723a3e6dcfbe0501dceb5e7.zip CMake-8eb20eeabeb2b0196723a3e6dcfbe0501dceb5e7.tar.gz CMake-8eb20eeabeb2b0196723a3e6dcfbe0501dceb5e7.tar.bz2 | |
ExternalData: Allow local stores without any URL templates
Allow ExternalData_URL_TEMPLATES to be empty if a value for
ExternalData_OBJECT_STORES is provided. Assume in this use case that
the object stores will already contain all needed objects. Extend the
Module.ExternalData test to cover this case (all objects in stores).
Extend the RunCMake.ExternalData test to cover the non-failure message
case when stores are provided without URL templates.
Diffstat (limited to 'Tests/RunCMake/ExternalData')
| -rw-r--r-- | Tests/RunCMake/ExternalData/NoURLTemplates-stderr.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/ExternalData/ObjectStoreOnly.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/ExternalData/RunCMakeTest.cmake | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Tests/RunCMake/ExternalData/NoURLTemplates-stderr.txt b/Tests/RunCMake/ExternalData/NoURLTemplates-stderr.txt index ad059d4..ccbaf5a 100644 --- a/Tests/RunCMake/ExternalData/NoURLTemplates-stderr.txt +++ b/Tests/RunCMake/ExternalData/NoURLTemplates-stderr.txt @@ -1,5 +1,5 @@ CMake Error at .*/Modules/ExternalData.cmake:[0-9]+ \(message\): - ExternalData_URL_TEMPLATES is not set! + Neither ExternalData_URL_TEMPLATES nor ExternalData_OBJECT_STORES is set! Call Stack \(most recent call first\): NoURLTemplates.cmake:2 \(ExternalData_Add_Target\) CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/ExternalData/ObjectStoreOnly.cmake b/Tests/RunCMake/ExternalData/ObjectStoreOnly.cmake new file mode 100644 index 0000000..5e66101 --- /dev/null +++ b/Tests/RunCMake/ExternalData/ObjectStoreOnly.cmake @@ -0,0 +1,3 @@ +include(ExternalData) +set(ExternalData_OBJECT_STORES "${CMAKE_CURRENT_BINARY_DIR}") +ExternalData_Add_Target(Data) diff --git a/Tests/RunCMake/ExternalData/RunCMakeTest.cmake b/Tests/RunCMake/ExternalData/RunCMakeTest.cmake index 8fba82c..93ff08f 100644 --- a/Tests/RunCMake/ExternalData/RunCMakeTest.cmake +++ b/Tests/RunCMake/ExternalData/RunCMakeTest.cmake @@ -22,6 +22,7 @@ run_cmake(NormalData2) run_cmake(NormalData3) run_cmake(NormalDataSub1) run_cmake(NotUnderRoot) +run_cmake(ObjectStoreOnly) run_cmake(Semicolon1) run_cmake(Semicolon2) run_cmake(Semicolon3) |