From 3b87be95be64ac4bf12001804e59ff74e161bf7b Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Mon, 22 Sep 2008 12:10:50 +0000
Subject: [PATCH] COMP: Cmake correction: Update
OTB_IO_UTILITIES_DEPENDENT_LIBRARIES variable and add it in th
eOTBConfig.cmake.in. Must use this variable in your TARGET_LINK_LIBRARIES()
command.
---
CMakeLists.txt | 28 +++++++++++++++++-----------
OTBConfig.cmake.in | 3 +++
2 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e77a4a85b..574c52a387 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -521,28 +521,34 @@ ENDIF(OTB_USE_VISU_GUI)
# => Create OTB_IO_UTILITIES_DEPENDENT_LIBRARIES
#SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "gdal dxf otbkml tinyXML otbgeotiff otbxtiff otbossim otbossimBase otbossimElevation otbossimFont otbossimKBool otbossimMatrix otbossimPlugin otbossimProjectionImaging otbossimSupportData otbossimVec otbossimVpfUtil")
-SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "gdal dxf tinyXML otbgeotiff otbxtiff otbossim otbossimBase otbossimElevation otbossimFont otbossimKBool otbossimMatrix otbossimPlugin otbossimProjectionImaging otbossimSupportData otbossimVec otbossimVpfUtil")
+SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "gdal;dxf;tinyXML;otbgeotiff;otbxtiff;otbossim" )
+#otbossimBase otbossimElevation otbossimFont otbossimKBool otbossimMatrix otbossimPlugin otbossimProjectionImaging otbossimSupportData otbossimVec otbossimVpfUtil")
+
+IF(NOT OTB_USE_EXTERNAL_OPENTHREADS)
+ SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES};${OPENTHREADS_LIBRARY}")
+ENDIF(NOT OTB_USE_EXTERNAL_OPENTHREADS)
# Add EXPAT library
IF( OTB_USE_EXTERNAL_EXPAT )
- SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} expat")
+ SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES};expat")
ELSE( OTB_USE_EXTERNAL_EXPAT )
- SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} otbexpat")
+ SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES};otbexpat")
ENDIF( OTB_USE_EXTERNAL_EXPAT )
+# Add Open Jpeg library
+IF( OTB_COMPILE_JPEG2000 )
+ SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES};otbopenjpeg")
+ENDIF( OTB_COMPILE_JPEG2000 )
+
# Add VISU libraries
-IF(OTB_USE_VISU_GUI)
- SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} ${OTB_VISU_GUI_LIBRARIES}")
-ENDIF(OTB_USE_VISU_GUI)
+#IF(OTB_USE_VISU_GUI)
+# SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} ${OTB_VISU_GUI_LIBRARIES}")
+#ENDIF(OTB_USE_VISU_GUI)
# => Create OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES
-SET(OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES "otb6S otbgalib InsightJournal otbsvm")
+SET(OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES "otb6S;otbgalib;InsightJournal;otbsvm")
-# => Create OTB_UTILITIES_DEPENDENT_LIBRARIES
-IF( OTB_COMPILE_JPEG2000 )
- SET(OTB_UTILITIES_DEPENDENT_LIBRARIES "${OTB_UTILITIES_DEPENDENT_LIBRARIES} otbopenjpeg")
-ENDIF( OTB_COMPILE_JPEG2000 )
# => Create OTB_ALLS_UTILITIES_DEPENDENT_LIBRARIES
SET(OTB_ALLS_UTILITIES_DEPENDENT_LIBRARIES "${OTB_IO_UTILITIES_DEPENDENT_LIBRARIES} ${OTB_ALGO_UTILITIES_DEPENDENT_LIBRARIES}")
diff --git a/OTBConfig.cmake.in b/OTBConfig.cmake.in
index b1468d3df6..01e4cfba6f 100644
--- a/OTBConfig.cmake.in
+++ b/OTBConfig.cmake.in
@@ -87,6 +87,9 @@ SET(FLTK_PLATFORM_DEPENDENT_LIBS "@FLTK_PLATFORM_DEPENDENT_LIBS@")
SET(OTB_USE_VISU_GUI "@OTB_USE_VISU_GUI@")
SET(OTB_VISU_GUI_LIBRARIES "@OTB_VISU_GUI_LIBRARIES@")
+# The list of OTB/Utilities IO libraries
+SET(OTB_IO_UTILITIES_DEPENDENT_LIBRARIES "@OTB_IO_UTILITIES_DEPENDENT_LIBRARIES@")
+
# The FLTK version number
#SET(FLTK_VERSION_MAJOR "@FLTK_VERSION_MAJOR@")
#SET(FLTK_VERSION_MINOR "@FLTK_VERSION_MINOR@")
--
GitLab