Skip to content
Snippets Groups Projects
Commit 49ebee07 authored by Julien Malik's avatar Julien Malik
Browse files

COMP: no need to link explicitely against pq library, pqxx is enough

parent b7757a9e
No related branches found
No related tags found
No related merge requests found
...@@ -84,13 +84,13 @@ FIND_PROGRAM(OTB_APPLICATION_LAUNCHER otbApplicationLauncherCommandLine PATHS ...@@ -84,13 +84,13 @@ FIND_PROGRAM(OTB_APPLICATION_LAUNCHER otbApplicationLauncherCommandLine PATHS
NO_SYSTEM_PATH) NO_SYSTEM_PATH)
IF(OTB_USE_EXTERNAL_ITK) IF(OTB_USE_EXTERNAL_ITK)
INCLUDE(${OTB_ITK_DIR}/ITKConfig.cmake) INCLUDE(${OTB_ITK_DIR}/ITKConfig.cmake)
INCLUDE(${ITK_USE_FILE}) INCLUDE(${ITK_USE_FILE})
ENDIF(OTB_USE_EXTERNAL_ITK) ENDIF(OTB_USE_EXTERNAL_ITK)
IF(USE_FFTWF OR USE_FFTWD) IF(USE_FFTWF OR USE_FFTWD)
FIND_PACKAGE(FFTW REQUIRED) FIND_PACKAGE(FFTW REQUIRED)
INCLUDE_DIRECTORIES(${FFTW_INCLUDE_PATH}) INCLUDE_DIRECTORIES(${FFTW_INCLUDE_PATH})
ENDIF(USE_FFTWF OR USE_FFTWD) ENDIF(USE_FFTWF OR USE_FFTWD)
IF(OTB_USE_EXTERNAL_EXPAT) IF(OTB_USE_EXTERNAL_EXPAT)
...@@ -245,13 +245,6 @@ IF(OTB_USE_PQXX) ...@@ -245,13 +245,6 @@ IF(OTB_USE_PQXX)
"Cannot find PQXX library. Please set PQXX_LIBRARY or SET OTB_USE_PQXX OFF.") "Cannot find PQXX library. Please set PQXX_LIBRARY or SET OTB_USE_PQXX OFF.")
ENDIF (NOT PQXX_LIBRARY) 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}) INCLUDE_DIRECTORIES(${PQXX_INCLUDE_DIR})
ENDIF(OTB_USE_PQXX) ENDIF(OTB_USE_PQXX)
......
...@@ -22,7 +22,7 @@ IF(OTB_USE_MAPNIK) ...@@ -22,7 +22,7 @@ IF(OTB_USE_MAPNIK)
ENDIF(OTB_USE_MAPNIK) ENDIF(OTB_USE_MAPNIK)
IF(OTB_USE_PQXX) IF(OTB_USE_PQXX)
TARGET_LINK_LIBRARIES(OTBCommon ${PQ_LIBRARY} ${PQXX_LIBRARY}) TARGET_LINK_LIBRARIES(OTBCommon ${PQXX_LIBRARY})
ENDIF(OTB_USE_PQXX) ENDIF(OTB_USE_PQXX)
IF(OTB_I18N) IF(OTB_I18N)
......
...@@ -4,7 +4,7 @@ FILE(GLOB OTBGeospatialAnalysis_SRCS "*.cxx" ) ...@@ -4,7 +4,7 @@ FILE(GLOB OTBGeospatialAnalysis_SRCS "*.cxx" )
ADD_LIBRARY(OTBGeospatialAnalysis ${OTBGeospatialAnalysis_SRCS}) 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) IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBGeospatialAnalysis PROPERTIES ${OTB_LIBRARY_PROPERTIES}) SET_TARGET_PROPERTIES(OTBGeospatialAnalysis PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES) ENDIF(OTB_LIBRARY_PROPERTIES)
......
...@@ -15,7 +15,7 @@ IF(OTB_USE_MAPNIK) ...@@ -15,7 +15,7 @@ IF(OTB_USE_MAPNIK)
ENDIF(OTB_USE_MAPNIK) ENDIF(OTB_USE_MAPNIK)
IF(OTB_USE_PQXX) IF(OTB_USE_PQXX)
TARGET_LINK_LIBRARIES(OTBOBIA ${PQ_LIBRARY} ${PQXX_LIBRARY}) TARGET_LINK_LIBRARIES(OTBOBIA ${PQXX_LIBRARY})
ENDIF(OTB_USE_PQXX) ENDIF(OTB_USE_PQXX)
IF(OTB_I18N) IF(OTB_I18N)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment