From 6eb6e318da6b040d19612cce02b37ae8e18b82d5 Mon Sep 17 00:00:00 2001 From: Julien Malik <julien.malik@c-s.fr> Date: Thu, 5 Jul 2012 13:29:00 +0200 Subject: [PATCH] COMP: remove unset/unused OTB_IO_UTILITIES_DEPENDENT_LIBRARIES cmake var --- CMake/OTBConfig.cmake.in | 3 --- Examples/GeospatialAnalysis/CMakeLists.txt | 2 +- Examples/MultiScale/CMakeLists.txt | 4 ++-- Examples/OBIA/CMakeLists.txt | 12 ++++++------ Examples/Tutorials/CMakeLists.txt | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/CMake/OTBConfig.cmake.in b/CMake/OTBConfig.cmake.in index 4fbe752d95..f40c9ff844 100644 --- a/CMake/OTBConfig.cmake.in +++ b/CMake/OTBConfig.cmake.in @@ -96,9 +96,6 @@ SET(OTB_CURL_MULTI_AVAILABLE "@OTB_CURL_MULTI_AVAILABLE@") #Developpers message SET(OTB_SHOW_ALL_MSG_DEBUG "@OTB_SHOW_ALL_MSG_DEBUG@") -# The list of OTB/Utilities IO libraries -SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "@OTB_IO_UTILITIES_DEPENDENT_LIBRARIES@") - # Option use external BOOST. SET(OTB_USE_EXTERNAL_BOOST "@OTB_USE_EXTERNAL_BOOST@") diff --git a/Examples/GeospatialAnalysis/CMakeLists.txt b/Examples/GeospatialAnalysis/CMakeLists.txt index 875256af96..25ee26a0aa 100644 --- a/Examples/GeospatialAnalysis/CMakeLists.txt +++ b/Examples/GeospatialAnalysis/CMakeLists.txt @@ -2,7 +2,7 @@ PROJECT(GeospatialAnalysisExamples) INCLUDE_REGULAR_EXPRESSION("^.*$") ADD_EXECUTABLE(PostGISCreateTable PostGISCreateTable.cxx ) -TARGET_LINK_LIBRARIES(PostGISCreateTable OTBCommon OTBIO OTBGeospatialAnalysis ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES}) +TARGET_LINK_LIBRARIES(PostGISCreateTable OTBCommon OTBIO OTBGeospatialAnalysis) diff --git a/Examples/MultiScale/CMakeLists.txt b/Examples/MultiScale/CMakeLists.txt index a260623bd2..9217ca5572 100644 --- a/Examples/MultiScale/CMakeLists.txt +++ b/Examples/MultiScale/CMakeLists.txt @@ -8,11 +8,11 @@ ADD_EXECUTABLE(MorphologicalPyramidSynthesisFilterExample MorphologicalPyramidSy TARGET_LINK_LIBRARIES(MorphologicalPyramidSynthesisFilterExample OTBCommon OTBIO OTBMultiScale) ADD_EXECUTABLE(MorphologicalPyramidSegmenterExample MorphologicalPyramidSegmenterExample.cxx ) -TARGET_LINK_LIBRARIES(MorphologicalPyramidSegmenterExample OTBCommon OTBIO OTBMultiScale ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES}) +TARGET_LINK_LIBRARIES(MorphologicalPyramidSegmenterExample OTBCommon OTBIO OTBMultiScale ) ADD_EXECUTABLE(MorphologicalPyramidSegmentationExample MorphologicalPyramidSegmentationExample.cxx ) -TARGET_LINK_LIBRARIES(MorphologicalPyramidSegmentationExample OTBCommon OTBIO OTBMultiScale ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES}) +TARGET_LINK_LIBRARIES(MorphologicalPyramidSegmentationExample OTBCommon OTBIO OTBMultiScale) diff --git a/Examples/OBIA/CMakeLists.txt b/Examples/OBIA/CMakeLists.txt index 999b2615e2..232ae77551 100644 --- a/Examples/OBIA/CMakeLists.txt +++ b/Examples/OBIA/CMakeLists.txt @@ -2,22 +2,22 @@ PROJECT(OBIAExamples) INCLUDE_REGULAR_EXPRESSION("^.*$") ADD_EXECUTABLE(ImageToLabelToImage ImageToLabelToImage.cxx ) -TARGET_LINK_LIBRARIES(ImageToLabelToImage OTBCommon OTBIO ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES}) +TARGET_LINK_LIBRARIES(ImageToLabelToImage OTBCommon OTBIO) ADD_EXECUTABLE(ShapeAttributeComputation ShapeAttributeComputation.cxx ) -TARGET_LINK_LIBRARIES(ShapeAttributeComputation OTBCommon OTBIO ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES}) +TARGET_LINK_LIBRARIES(ShapeAttributeComputation OTBCommon OTBIO) ADD_EXECUTABLE(KeepNObjects KeepNObjects.cxx ) -TARGET_LINK_LIBRARIES(KeepNObjects OTBCommon OTBIO ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES}) +TARGET_LINK_LIBRARIES(KeepNObjects OTBCommon OTBIO) ADD_EXECUTABLE(RadiometricAttributesLabelMapFilterExample RadiometricAttributesLabelMapFilterExample.cxx ) -TARGET_LINK_LIBRARIES(RadiometricAttributesLabelMapFilterExample OTBCommon OTBIO OTBBasicFilters OTBSpatialReasoning OTBFeatureExtraction OTBLearning ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES}) +TARGET_LINK_LIBRARIES(RadiometricAttributesLabelMapFilterExample OTBCommon OTBIO OTBBasicFilters OTBSpatialReasoning OTBFeatureExtraction OTBLearning) ADD_EXECUTABLE(LabelMapToVectorData LabelMapToVectorData.cxx ) -TARGET_LINK_LIBRARIES(LabelMapToVectorData OTBCommon OTBIO OTBBasicFilters ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES}) +TARGET_LINK_LIBRARIES(LabelMapToVectorData OTBCommon OTBIO OTBBasicFilters) ADD_EXECUTABLE(HooverMetricsEstimation HooverMetricsEstimation.cxx ) -TARGET_LINK_LIBRARIES(HooverMetricsEstimation OTBCommon OTBIO OTBBasicFilters ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES}) +TARGET_LINK_LIBRARIES(HooverMetricsEstimation OTBCommon OTBIO OTBBasicFilters) IF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING ) diff --git a/Examples/Tutorials/CMakeLists.txt b/Examples/Tutorials/CMakeLists.txt index 364497e097..a3d0b5ec83 100644 --- a/Examples/Tutorials/CMakeLists.txt +++ b/Examples/Tutorials/CMakeLists.txt @@ -2,7 +2,7 @@ PROJECT(TutorialsExamples) INCLUDE_REGULAR_EXPRESSION("^.*$") ADD_EXECUTABLE(HelloWorldOTB HelloWorldOTB.cxx ) -TARGET_LINK_LIBRARIES(HelloWorldOTB OTBCommon OTBIO ${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES}) +TARGET_LINK_LIBRARIES(HelloWorldOTB OTBCommon OTBIO) ADD_EXECUTABLE(Pipeline Pipeline.cxx ) TARGET_LINK_LIBRARIES(Pipeline OTBCommon OTBIO) -- GitLab