From 480f8497b8913681590cd530ca96bf1ce1f21c66 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Sun, 5 Sep 2010 14:01:38 +0200
Subject: [PATCH] BUG: fix compilation of tests with PQXX
---
Testing/Code/Common/CMakeLists.txt | 21 ---------------------
Testing/Code/Common/otbCommonTests10.cxx | 1 -
Testing/Code/OBIA/CMakeLists.txt | 11 +++++++----
3 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index b0243bad07..d75c1876f4 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -877,28 +877,10 @@ ADD_TEST(coTuGISTableToGISTableFilterNew ${COMMON_TESTS10}
)
-ADD_TEST(coTuLabelMapToGISTableFilterNew ${COMMON_TESTS10}
- otbLabelMapToGISTableFilterNew
-)
-
-ADD_TEST(coTuGISTableToLabelMapFilterNew ${COMMON_TESTS10}
- otbGISTableToLabelMapFilterNew
-)
-
ADD_TEST(coTuGISTableToVectorDataFilterNew ${COMMON_TESTS10}
otbGISTableToVectorDataFilterNew
)
-ADD_TEST(coTvLabelMapToGISTableFilter ${COMMON_TESTS10}
- otbLabelMapToGISTableFilter
- ${INPUTDATA}/rcc8_mire1.png
- orfeotoolbox_test
- labelmaptogis_test_table
- orfeotoolbox_test_user
- Bidfeud0
-)
-
-
#need gdal 1.6 for POSTGIS tables connection via OGR string
ADD_TEST(coTvGISTableToVectorDataFilter ${COMMON_TESTS10}
otbGISTableToVectorDataFilter
@@ -1094,10 +1076,7 @@ otbPostGISTableNew.cxx
otbVectorDataToGISTableFilterNew.cxx
# otbVectorDataToGISTableFilter.cxx
otbGISTableToGISTableFilterNew.cxx
-otbLabelMapToGISTableFilterNew.cxx
-otbGISTableToLabelMapFilterNew.cxx
otbGISTableToVectorDataFilterNew.cxx
-otbLabelMapToGISTableFilter.cxx
otbGISTableToVectorDataFilter.cxx
otbGISTableSourceNew.cxx
)
diff --git a/Testing/Code/Common/otbCommonTests10.cxx b/Testing/Code/Common/otbCommonTests10.cxx
index ff01eff4f1..229d1b167d 100644
--- a/Testing/Code/Common/otbCommonTests10.cxx
+++ b/Testing/Code/Common/otbCommonTests10.cxx
@@ -34,7 +34,6 @@ void RegisterTests()
REGISTER_TEST(otbVectorDataToGISTableFilterNew);
REGISTER_TEST(otbGISTableToGISTableFilterNew);
REGISTER_TEST(otbGISTableToVectorDataFilterNew);
- REGISTER_TEST(otbGISTableToLabelMapFilterNew);
REGISTER_TEST(otbGISTableToVectorDataFilter);
REGISTER_TEST(otbGISTableSourceNew);
}
diff --git a/Testing/Code/OBIA/CMakeLists.txt b/Testing/Code/OBIA/CMakeLists.txt
index d5ceb0182d..38e73d5751 100644
--- a/Testing/Code/OBIA/CMakeLists.txt
+++ b/Testing/Code/OBIA/CMakeLists.txt
@@ -117,10 +117,13 @@ otbVectorDataToLabelMapFilter
# OBIATests2 (need PQXX)
IF(OTB_USE_PQXX)
-ADD_TEST(obTuLabelMapToGISTableFilterNew ${OBIA_TESTS1}
+ADD_TEST(obTuLabelMapToGISTableFilterNew ${OBIA_TESTS2}
otbLabelMapToGISTableFilterNew)
-ADD_TEST(obTvLabelMapToGISTableFilter ${OBIA_TESTS1}
+ADD_TEST(obTuGISTableToLabelMapFilterNew ${OBIA_TESTS2}
+ otbGISTableToLabelMapFilterNew)
+
+ADD_TEST(obTvLabelMapToGISTableFilter ${OBIA_TESTS2}
otbLabelMapToGISTableFilter
${INPUTDATA}/rcc8_mire1.png
orfeotoolbox_test
@@ -153,9 +156,9 @@ otbVectorDataToLabelMapFilterNew.cxx
IF(OTB_USE_PQXX)
SET(BasicOBIA_SRCS2
-otbLabelMapToGISTableFilter.cxx
otbLabelMapToGISTableFilterNew.cxx
otbGISTableToLabelMapFilterNew.cxx
+otbLabelMapToGISTableFilter.cxx
)
ENDIF(OTB_USE_PQXX)
@@ -164,7 +167,7 @@ TARGET_LINK_LIBRARIES(otbOBIATests1 OTBIO OTBOBIA OTBTesting)
IF(OTB_USE_PQXX)
ADD_EXECUTABLE(otbOBIATests2 otbOBIATests2.cxx ${BasicOBIA_SRCS2})
-TARGET_LINK_LIBRARIES(otbOBIATests2 OTBIO OTBOBIA OTBTesting)
+TARGET_LINK_LIBRARIES(otbOBIATests2 OTBIO OTBOBIA OTBTesting OTBGeospatialAnalysis pq pqxx)
ENDIF(OTB_USE_PQXX)
ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
--
GitLab