From 66223ba26300085b43db802bc316ee3733150a96 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Sat, 5 Nov 2011 14:08:34 +0100
Subject: [PATCH] ENH: import external libraries after setting OTB installation
paths
---
CMakeLists.txt | 41 ++++++++++++++++++++++-------------------
1 file changed, 22 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index df1e42ec3f..2537c8ea98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,25 +114,6 @@ SET(OTB_LIBRARY_PATH "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
SET(OTB_EXECUTABLE_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
SET(CXX_TEST_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-#-----------------------------------------------------------------------------
-# External libraries
-
-FIND_PACKAGE(OSGeo4W)
-# Put GDAL first, since on Windows, include dirs for other libs (curl, expat, mapnik) contain gdal 1.5 includes
-INCLUDE(ImportGdal)
-INCLUDE(ImportLibLAS) # depends on ImportGdal
-INCLUDE(ImportExpat)
-INCLUDE(ImportITK)
-INCLUDE(ImportJPEG2000)
-INCLUDE(ImportFLTK) # depends on ImportGdal
-INCLUDE(ImportCurl)
-INCLUDE(ImportPqxx)
-INCLUDE(ImportBoost)
-INCLUDE(ImportMapnik) # depends on ImportBoost
-INCLUDE(ImportGetText)
-INCLUDE(ImportOpenThreads)
-INCLUDE(ImportOssim)
-
#-----------------------------------------------------------------------------
# Installation vars.
# OTB_INSTALL_BIN_DIR - binary dir (executables)
@@ -213,6 +194,28 @@ STRING(REGEX REPLACE "^/" "" OTB_INSTALL_PYTHON_DIR_CM24 "${OTB_INSTALL_PYTHON_D
INCLUDE(PreventInstallOnBuildTree)
+
+#-----------------------------------------------------------------------------
+# External libraries
+
+FIND_PACKAGE(OSGeo4W)
+# Put GDAL first, since on Windows, include dirs for other libs (curl, expat, mapnik) contain gdal 1.5 includes
+INCLUDE(ImportGdal)
+INCLUDE(ImportLibLAS) # depends on ImportGdal
+INCLUDE(ImportExpat)
+INCLUDE(ImportITK)
+INCLUDE(ImportJPEG2000)
+INCLUDE(ImportFLTK) # depends on ImportGdal
+INCLUDE(ImportCurl)
+INCLUDE(ImportPqxx)
+INCLUDE(ImportBoost)
+INCLUDE(ImportMapnik) # depends on ImportBoost
+INCLUDE(ImportGetText)
+INCLUDE(ImportOpenThreads)
+INCLUDE(ImportOssim)
+
+
+
INCLUDE_DIRECTORIES (
${OTB_BINARY_DIR}
${OTB_INCLUDE_DIRS} )
--
GitLab