From b199a4cc64f2601cb1831b00da0c82bab86d6085 Mon Sep 17 00:00:00 2001
From: Otmane Lahlou <otmane.lahlou@c-s.fr>
Date: Mon, 24 Jan 2011 11:47:24 +0100
Subject: [PATCH] ENH : correct the fontfile location
---
Examples/Visualization/CMakeLists.txt | 4 ++--
Testing/Code/Common/CMakeLists.txt | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Examples/Visualization/CMakeLists.txt b/Examples/Visualization/CMakeLists.txt
index a7d7347bd2..355f42aafc 100644
--- a/Examples/Visualization/CMakeLists.txt
+++ b/Examples/Visualization/CMakeLists.txt
@@ -11,7 +11,7 @@ ENDIF(OTB_USE_MAPNIK)
IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
-SET(BASELINE ${OTB_DATA_ROOT}/Baseline/Examples/Visualization)
+SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
SET(INPUTDATA ${OTB_DATA_ROOT}/Input)
#Remote sensing images (large images )
@@ -35,7 +35,7 @@ IF(OTB_DATA_USE_LARGEINPUT)
${INPUTLARGEDATA}/VECTOR/MidiPyrenees/roads.shp
${OTB_DATA_ROOT}/Input/DEM/srtm_directory
0
- ${BASELINE_FILES}/DejaVuSans.ttf
+ ${INPUTDATA}/DejaVuSans.ttf
)
ENDIF(OTB_USE_MAPNIK)
ENDIF(OTB_DATA_USE_LARGEINPUT)
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index 2ef276f9d9..a598f4ed52 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -794,7 +794,7 @@ ADD_TEST(coTvVectorDataToImageFilter ${COMMON_TESTS9}
otbVectorDataToImageFilter
${LARGEINPUT}/VECTOR/MidiPyrenees/roads.shp
${TEMP}/coTvVectorDataToImageFilter.png
- ${BASELINE_FILES}/DejaVuSans.ttf # font
+ ${INPUTDATA}/DejaVuSans.ttf # font
)
ADD_TEST(coTvVectorDataToImageFilterBinary ${COMMON_TESTS9}
@@ -829,7 +829,7 @@ ADD_TEST(coTvVectorDataToImageFilterSensorModel ${COMMON_TESTS9}
${LARGEINPUT}/VECTOR/MidiPyrenees/roads.shp
${LARGEINPUT}/QUICKBIRD/TOULOUSE/000000128955_01_P001_PAN/02APR01105228-P1BS-000000128955_01_P001.TIF
${TEMP}/coTvVectorDataToImageFilterSensorModel.png
- ${BASELINE_FILES}/DejaVuSans.ttf # font
+ ${INPUTDATA}/DejaVuSans.ttf # font
)
ENDIF(OTB_DATA_USE_LARGEINPUT)
@@ -844,7 +844,7 @@ ADD_TEST(coTvVectorDataToImageFilterWorld ${COMMON_TESTS9}
500 500 #Size
-20 60 #lon/lat
0.1 -0.1 #spacing lon/lat
- ${BASELINE_FILES}/DejaVuSans.ttf # font
+ ${INPUTDATA}/DejaVuSans.ttf # font
)
--
GitLab