From 49ebee07f362e5d4f25e7ec5a384179decec04d9 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Wed, 4 Jul 2012 20:14:23 +0200
Subject: [PATCH] COMP: no need to link explicitely against pq library, pqxx is
enough
---
CMake/UseOTB.cmake.in | 15 ++++-----------
Code/Common/CMakeLists.txt | 2 +-
Code/GeospatialAnalysis/CMakeLists.txt | 2 +-
Code/OBIA/CMakeLists.txt | 2 +-
4 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/CMake/UseOTB.cmake.in b/CMake/UseOTB.cmake.in
index ff11baa29a..e28429baa5 100644
--- a/CMake/UseOTB.cmake.in
+++ b/CMake/UseOTB.cmake.in
@@ -84,13 +84,13 @@ FIND_PROGRAM(OTB_APPLICATION_LAUNCHER otbApplicationLauncherCommandLine PATHS
NO_SYSTEM_PATH)
IF(OTB_USE_EXTERNAL_ITK)
-INCLUDE(${OTB_ITK_DIR}/ITKConfig.cmake)
-INCLUDE(${ITK_USE_FILE})
+ INCLUDE(${OTB_ITK_DIR}/ITKConfig.cmake)
+ INCLUDE(${ITK_USE_FILE})
ENDIF(OTB_USE_EXTERNAL_ITK)
IF(USE_FFTWF OR USE_FFTWD)
- FIND_PACKAGE(FFTW REQUIRED)
- INCLUDE_DIRECTORIES(${FFTW_INCLUDE_PATH})
+ FIND_PACKAGE(FFTW REQUIRED)
+ INCLUDE_DIRECTORIES(${FFTW_INCLUDE_PATH})
ENDIF(USE_FFTWF OR USE_FFTWD)
IF(OTB_USE_EXTERNAL_EXPAT)
@@ -245,13 +245,6 @@ IF(OTB_USE_PQXX)
"Cannot find PQXX library. Please set PQXX_LIBRARY or SET OTB_USE_PQXX OFF.")
ENDIF (NOT PQXX_LIBRARY)
- FIND_LIBRARY(PQ_LIBRARY pq )
- MARK_AS_ADVANCED(PQ_LIBRARY)
- IF (NOT PQ_LIBRARY)
- MESSAGE(FATAL_ERROR
- "Cannot find PQ library. Please set PQ_LIBRARY or SET OTB_USE_PQXX OFF.")
- ENDIF (NOT PQ_LIBRARY)
-
INCLUDE_DIRECTORIES(${PQXX_INCLUDE_DIR})
ENDIF(OTB_USE_PQXX)
diff --git a/Code/Common/CMakeLists.txt b/Code/Common/CMakeLists.txt
index 6cbe999995..beb5bca483 100644
--- a/Code/Common/CMakeLists.txt
+++ b/Code/Common/CMakeLists.txt
@@ -22,7 +22,7 @@ IF(OTB_USE_MAPNIK)
ENDIF(OTB_USE_MAPNIK)
IF(OTB_USE_PQXX)
- TARGET_LINK_LIBRARIES(OTBCommon ${PQ_LIBRARY} ${PQXX_LIBRARY})
+ TARGET_LINK_LIBRARIES(OTBCommon ${PQXX_LIBRARY})
ENDIF(OTB_USE_PQXX)
IF(OTB_I18N)
diff --git a/Code/GeospatialAnalysis/CMakeLists.txt b/Code/GeospatialAnalysis/CMakeLists.txt
index 73a8cf61d6..c68fd6e257 100644
--- a/Code/GeospatialAnalysis/CMakeLists.txt
+++ b/Code/GeospatialAnalysis/CMakeLists.txt
@@ -4,7 +4,7 @@ FILE(GLOB OTBGeospatialAnalysis_SRCS "*.cxx" )
ADD_LIBRARY(OTBGeospatialAnalysis ${OTBGeospatialAnalysis_SRCS})
-TARGET_LINK_LIBRARIES (OTBGeospatialAnalysis OTBCommon ${PQ_LIBRARY} ${PQXX_LIBRARY})
+TARGET_LINK_LIBRARIES (OTBGeospatialAnalysis OTBCommon ${PQXX_LIBRARY})
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBGeospatialAnalysis PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
diff --git a/Code/OBIA/CMakeLists.txt b/Code/OBIA/CMakeLists.txt
index 13b249f662..cd5d1d9286 100644
--- a/Code/OBIA/CMakeLists.txt
+++ b/Code/OBIA/CMakeLists.txt
@@ -15,7 +15,7 @@ IF(OTB_USE_MAPNIK)
ENDIF(OTB_USE_MAPNIK)
IF(OTB_USE_PQXX)
- TARGET_LINK_LIBRARIES(OTBOBIA ${PQ_LIBRARY} ${PQXX_LIBRARY})
+ TARGET_LINK_LIBRARIES(OTBOBIA ${PQXX_LIBRARY})
ENDIF(OTB_USE_PQXX)
IF(OTB_I18N)
--
GitLab