From 5df3207253a9e4fd9d6fd01ba42de26e0e3484c4 Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Thu, 17 Dec 2009 17:34:49 +0800
Subject: [PATCH] COMP: library mess...
---
Code/Common/CMakeLists.txt | 2 +-
Code/IO/CMakeLists.txt | 4 +++-
Code/Radiometry/CMakeLists.txt | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Code/Common/CMakeLists.txt b/Code/Common/CMakeLists.txt
index 7f516a7943..c6f7d53028 100644
--- a/Code/Common/CMakeLists.txt
+++ b/Code/Common/CMakeLists.txt
@@ -19,7 +19,7 @@ ENDIF(OTB_USE_MAPNIK)
IF(OTB_USE_PQXX)
#TODO this line should be refined when we will like to have this capability with windows
- TARGET_LINK_LIBRARIES(OTBCommon pq pqxx)
+ TARGET_LINK_LIBRARIES(OTBCommon ${PQ_LIBRARY} ${PQXX_LIBRARY})
ENDIF(OTB_USE_PQXX)
IF(OTB_I18N)
diff --git a/Code/IO/CMakeLists.txt b/Code/IO/CMakeLists.txt
index 5d296cf6f1..876326d9ba 100644
--- a/Code/IO/CMakeLists.txt
+++ b/Code/IO/CMakeLists.txt
@@ -30,7 +30,9 @@ ENDIF(OTB_COMPILE_JPEG2000)
ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
-TARGET_LINK_LIBRARIES (OTBIO OTBCommon ${GDAL_LIBRARY} ${OGR_LIBRARY} otbossim otbossimplugins ITKIO ITKCommon dxf otbkml)
+TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} OTBCommon)
+TARGET_LINK_LIBRARIES (OTBIO otbossim otbossimplugins ITKIO ITKCommon dxf otbkml)
+
IF (OTB_USE_LIBLAS)
TARGET_LINK_LIBRARIES(OTBIO otbliblas)
ENDIF(OTB_USE_LIBLAS)
diff --git a/Code/Radiometry/CMakeLists.txt b/Code/Radiometry/CMakeLists.txt
index b14a18b2ed..f280fb3030 100644
--- a/Code/Radiometry/CMakeLists.txt
+++ b/Code/Radiometry/CMakeLists.txt
@@ -3,7 +3,9 @@
FILE(GLOB OTBRadiometry_SRCS "*.cxx" )
ADD_LIBRARY(OTBRadiometry ${OTBRadiometry_SRCS})
-TARGET_LINK_LIBRARIES (OTBRadiometry OTBCommon otb6S otbossim)
+
+#Note: depend on OTBIO instead of otbossim to keep the correct order between gdal and ossim
+TARGET_LINK_LIBRARIES (OTBRadiometry OTBCommon otb6S OTBIO)
IF(OTB_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(OTBRadiometry PROPERTIES ${OTB_LIBRARY_PROPERTIES})
ENDIF(OTB_LIBRARY_PROPERTIES)
--
GitLab