From b79c603f4033e47922415bafba0c24204e766f7d Mon Sep 17 00:00:00 2001
From: Christophe Palmann <christophe.palmann@c-s.fr>
Date: Fri, 3 Apr 2015 11:09:23 +0200
Subject: [PATCH] ENH: better fix (see also d62758b84077)
---
Examples/FeatureExtraction/CMakeLists.txt | 11 ++++-------
Examples/FeatureExtraction/test/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Examples/FeatureExtraction/CMakeLists.txt b/Examples/FeatureExtraction/CMakeLists.txt
index 0739bf5cc3..ec46f9fd89 100644
--- a/Examples/FeatureExtraction/CMakeLists.txt
+++ b/Examples/FeatureExtraction/CMakeLists.txt
@@ -1,8 +1,5 @@
project(FeatureExtractionExamples)
-include_directories("${OTB_SOURCE_DIR}/Modules/Filtering/VectorDataRendering/include")
-file(GLOB DataRendering_HEADERS "${OTB_SOURCE_DIR}/Modules/Filtering/VectorDataRendering/include/*.h")
-
add_executable(AlignmentsExample AlignmentsExample.cxx)
target_link_libraries(AlignmentsExample ${OTB_LIBRARIES})
@@ -45,8 +42,8 @@ target_link_libraries(HarrisExample ${OTB_LIBRARIES})
add_executable(HuMomentsImageFunctionExample HuMomentsImageFunctionExample.cxx)
target_link_libraries(HuMomentsImageFunctionExample ${OTB_LIBRARIES})
-if (Module_OTBVectorDataRendering)
- add_executable(LineSegmentDetectorExample LineSegmentDetectorExample.cxx ${DataRendering_HEADERS})
+if (Module_OTBVectorDataRendering AND OTB_USE_MAPNIK)
+ add_executable(LineSegmentDetectorExample LineSegmentDetectorExample.cxx)
target_link_libraries(LineSegmentDetectorExample ${OTB_LIBRARIES})
endif()
@@ -62,8 +59,8 @@ target_link_libraries(ParallelLineDetectionExample ${OTB_LIBRARIES})
add_executable(RatioLineDetectorExample RatioLineDetectorExample.cxx)
target_link_libraries(RatioLineDetectorExample ${OTB_LIBRARIES})
-if (Module_OTBVectorDataRendering)
- add_executable(RightAngleDetectionExample RightAngleDetectionExample.cxx ${DataRendering_HEADERS})
+if (Module_OTBVectorDataRendering AND OTB_USE_MAPNIK)
+ add_executable(RightAngleDetectionExample RightAngleDetectionExample.cxx)
target_link_libraries(RightAngleDetectionExample ${OTB_LIBRARIES})
endif()
diff --git a/Examples/FeatureExtraction/test/CMakeLists.txt b/Examples/FeatureExtraction/test/CMakeLists.txt
index 0159ad4ee3..9e351acd2a 100644
--- a/Examples/FeatureExtraction/test/CMakeLists.txt
+++ b/Examples/FeatureExtraction/test/CMakeLists.txt
@@ -192,7 +192,7 @@ otb_add_test(NAME feTeCloudDetectionExampleTest COMMAND ${OTB_TEST_DRIVER}
553 467 734 581 0.4 0.6 1.0
)
-if (Module_OTBVectorDataRendering)
+if (Module_OTBVectorDataRendering AND OTB_USE_MAPNIK)
# ------- Line Segment Detector test----------
otb_add_test(NAME feTeLineSegmentDetectorExampleTest COMMAND ${OTB_TEST_DRIVER}
--
GitLab