Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 621b1e1

Browse files
committedSep 9, 2015
ENH: Add configuration to build the module outside ITK.
This requires ITK Git master. The test content links must be moved to the module because ITK_DATA_ROOT is not necessarily available or populated.
1 parent f37d34b commit 621b1e1

File tree

5 files changed

+25
-7
lines changed

5 files changed

+25
-7
lines changed
 

‎CMakeLists.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
cmake_minimum_required(VERSION 2.8.9)
12
project(SCIFIO)
3+
24
set(SCIFIO_LIBRARIES SCIFIO)
3-
itk_module_impl()
5+
6+
if(NOT ITK_SOURCE_DIR)
7+
find_package(ITK REQUIRED)
8+
list(APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR})
9+
include(ITKModuleExternal)
10+
else()
11+
itk_module_impl()
12+
endif()

‎CTestConfig.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(CTEST_PROJECT_NAME "ITK")
2+
set(CTEST_NIGHTLY_START_TIME "1:00:00 UTC")
3+
4+
set(CTEST_DROP_METHOD "http")
5+
set(CTEST_DROP_SITE "open.cdash.org")
6+
set(CTEST_DROP_LOCATION "/submit.php?project=Insight")
7+
set(CTEST_DROP_SITE_CDASH TRUE)

‎test/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ endforeach()
3030
# Test I/O using itk::Image
3131
itk_add_test( NAME ITKSCIFIOImageIOTest
3232
COMMAND SCIFIOTestDriver
33-
--compare DATA{${ITK_DATA_ROOT}/Input/cthead1.tif}
33+
--compare DATA{Input/cthead1.tif}
3434
${ITK_TEST_OUTPUT_DIR}/cthead1_scifio.tif
35-
itkSCIFIOImageIOTest DATA{${ITK_DATA_ROOT}/Input/cthead1.tif}
35+
itkSCIFIOImageIOTest DATA{Input/cthead1.tif}
3636
${ITK_TEST_OUTPUT_DIR}/cthead1_scifio.tif )
3737

3838
# Test I/O using itk::RGBPixel
3939
itk_add_test( NAME ITKRGBSCIFIOImageIOTest
4040
COMMAND SCIFIOTestDriver
41-
--compare DATA{${ITK_DATA_ROOT}/Input/image_color.bmp}
41+
--compare DATA{Input/image_color.bmp}
4242
${ITK_TEST_OUTPUT_DIR}/image_color_scifio.png
43-
itkRGBSCIFIOImageIOTest DATA{${ITK_DATA_ROOT}/Input/image_color.bmp}
43+
itkRGBSCIFIOImageIOTest DATA{Input/image_color.bmp}
4444
${ITK_TEST_OUTPUT_DIR}/image_color_scifio.png )
4545

4646
# Test I/O using itk::VectorImage
4747
itk_add_test( NAME ITKVectorImageSCIFIOImageIOTest
4848
COMMAND SCIFIOTestDriver
49-
--compare DATA{${ITK_DATA_ROOT}/Input/cthead1.tif}
49+
--compare DATA{Input/cthead1.tif}
5050
${ITK_TEST_OUTPUT_DIR}/cthead1_scifio_vector.tif
51-
itkVectorImageSCIFIOImageIOTest DATA{${ITK_DATA_ROOT}/Input/cthead1.tif}
51+
itkVectorImageSCIFIOImageIOTest DATA{Input/cthead1.tif}
5252
${ITK_TEST_OUTPUT_DIR}/cthead1_scifio_vector.tif )

‎test/Input/cthead1.tif.md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c49aba3e44e3551d07b18e486ad28423

‎test/Input/image_color.bmp.md5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ac4410faf7be7b7cce2a1a8c18ec013a

0 commit comments

Comments
 (0)
Please sign in to comment.