From b4a51e3c0dd380dbd946095b503e9a3447f49fd1 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Wed, 4 Jul 2012 19:12:54 +0200
Subject: [PATCH] COMP: OTB_USE_PQXX compilation macro is not used anywhere in
the code
---
CMake/ImportPqxx.cmake | 1 -
CMake/UseOTB.cmake.in | 5 -----
2 files changed, 6 deletions(-)
diff --git a/CMake/ImportPqxx.cmake b/CMake/ImportPqxx.cmake
index 9c33b54c25..00020cc275 100644
--- a/CMake/ImportPqxx.cmake
+++ b/CMake/ImportPqxx.cmake
@@ -7,7 +7,6 @@ IF(OTB_USE_PQXX)
FIND_PACKAGE(Pqxx)
IF(PQXX_FOUND)
MESSAGE(STATUS "Activating Pqxx support")
- ADD_DEFINITIONS(-DOTB_USE_PQXX)
ELSE(PQXX_FOUND)
# Generate an error if no external Pqxx is available
MESSAGE(FATAL_ERROR "Pqxx required but not found. "
diff --git a/CMake/UseOTB.cmake.in b/CMake/UseOTB.cmake.in
index 2b5d6e5c05..2bc40f4760 100644
--- a/CMake/UseOTB.cmake.in
+++ b/CMake/UseOTB.cmake.in
@@ -240,7 +240,6 @@ IF(OTB_USE_PQXX)
"Cannot find PQXX include directory. Please set PQXX_INCLUDE_DIR or SET OTB_USE_PQXX OFF.")
ENDIF (NOT PQXX_INCLUDE_DIR)
-
FIND_LIBRARY(PQXX_LIBRARY pqxx )
MARK_AS_ADVANCED(PQXX_LIBRARY)
IF (NOT PQXX_LIBRARY)
@@ -255,10 +254,6 @@ IF(OTB_USE_PQXX)
"Cannot find PQ library. Please set PQ_LIBRARY or SET OTB_USE_PQXX OFF.")
ENDIF (NOT PQ_LIBRARY)
-
- # Add compiler option
- ADD_DEFINITIONS(-DOTB_USE_PQXX)
-
INCLUDE_DIRECTORIES(${PQXX_INCLUDE_DIR})
ENDIF(OTB_USE_PQXX)
--
GitLab