From f1a0a1831466f90c47f49f84ad988849833597f4 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Sun, 24 Jun 2012 01:20:50 +0200
Subject: [PATCH] COMP: fix use of install tree
---
CMake/otbGenerateOTBConfig.cmake | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/CMake/otbGenerateOTBConfig.cmake b/CMake/otbGenerateOTBConfig.cmake
index f98b3ca83e..d9e3ff75d4 100644
--- a/CMake/otbGenerateOTBConfig.cmake
+++ b/CMake/otbGenerateOTBConfig.cmake
@@ -44,19 +44,19 @@ CONFIGURE_FILE(${OTB_SOURCE_DIR}/CMake/OTBConfig.cmake.in
# Settings specific to the install tree.
# The library dependencies file.
-SET(OTB_LIBRARY_DEPENDS_FILE "\${OTB_INSTALL_PREFIX}${OTB_INSTALL_PACKAGE_DIR}/OTBLibraryDepends.cmake")
+SET(OTB_LIBRARY_DEPENDS_FILE "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}/OTBLibraryDepends.cmake")
# The "use" file.
-SET(OTB_USE_FILE \${OTB_INSTALL_PREFIX}${OTB_INSTALL_PACKAGE_DIR}/UseOTB.cmake)
+SET(OTB_USE_FILE \${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}/UseOTB.cmake)
# The build settings file.
-SET(OTB_BUILD_SETTINGS_FILE \${OTB_INSTALL_PREFIX}${OTB_INSTALL_PACKAGE_DIR}/OTBBuildSettings.cmake)
+SET(OTB_BUILD_SETTINGS_FILE \${OTB_INSTALL_PREFIX}/${OTB_INSTALL_PACKAGE_DIR}/OTBBuildSettings.cmake)
# Include directories.
-SET(OTB_INCLUDE_DIRS_CONFIG \${OTB_INSTALL_PREFIX}${OTB_INSTALL_INCLUDE_DIR})
+SET(OTB_INCLUDE_DIRS_CONFIG \${OTB_INSTALL_PREFIX}/${OTB_INSTALL_INCLUDE_DIR})
FOREACH(DIR ${OTB_INCLUDE_RELATIVE_DIRS})
- LIST(APPEND OTB_INCLUDE_DIRS_CONFIG \${OTB_INSTALL_PREFIX}${OTB_INSTALL_INCLUDE_DIR}/${DIR})
+ LIST(APPEND OTB_INCLUDE_DIRS_CONFIG \${OTB_INSTALL_PREFIX}/${OTB_INSTALL_INCLUDE_DIR}/${DIR})
ENDFOREACH(DIR)
IF(OTB_INCLUDE_DIRS_SYSTEM)
LIST(APPEND OTB_INCLUDE_DIRS_CONFIG ${OTB_INCLUDE_DIRS_SYSTEM})
@@ -67,10 +67,10 @@ SET(OTB_INCLUDE_DIRS_CONFIG ${OTB_INCLUDE_DIRS_CONFIG}
${OTB_INCLUDE_ABSOLUE_DIRS} )
# Link directories.
-SET(OTB_LIBRARY_DIRS_CONFIG "\${OTB_INSTALL_PREFIX}${OTB_INSTALL_LIB_DIR}")
+SET(OTB_LIBRARY_DIRS_CONFIG "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_LIB_DIR}")
# Binary directories
-SET(OTB_BINARY_DIRS_CONFIG "\${OTB_INSTALL_PREFIX}${OTB_INSTALL_BIN_DIR}")
+SET(OTB_BINARY_DIRS_CONFIG "\${OTB_INSTALL_PREFIX}/${OTB_INSTALL_BIN_DIR}")
#-----------------------------------------------------------------------------
# Configure OTBConfig.cmake for the INSTALL tree.
--
GitLab