diff --git a/CMake/UseOTB.cmake.in b/CMake/UseOTB.cmake.in
index ff11baa29a0ff41f2f66da9171583c4b3fcea640..e28429baa57d1d341c8e149d1e3668507d88b031 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 6cbe999995d2689dd6e3ac033c3595aba2aa3cb3..beb5bca4830ba6ff60b3774a27e51b49188e5e2d 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 73a8cf61d62422f332856324f22c48438e2cf3d7..c68fd6e25736cb97db1377d87b8f2b6c302c50b4 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 13b249f662a1a166900d683427811d5f6094a1cc..cd5d1d92865256ed9fd4eba3a24359b8f3e08174 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)