From c46cd2ed8d39fa915952ba2e653dc98109074b96 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Wed, 14 Sep 2011 13:07:06 +0200
Subject: [PATCH] COMP: fix install of Applications
---
CMake/WrapperMacros.cmake | 4 ++--
CMakeLists.txt | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/CMake/WrapperMacros.cmake b/CMake/WrapperMacros.cmake
index cfa6258d2d..949b44bfcd 100644
--- a/CMake/WrapperMacros.cmake
+++ b/CMake/WrapperMacros.cmake
@@ -20,6 +20,6 @@ macro(OTB_CREATE_APPLICATION)
endif()
install(TARGETS ${APPLICATION_TARGET_NAME}
- RUNTIME DESTINATION OTB_INSTALL_BIN_DIR_CM24
- LIBRARY DESTINATION OTB_INSTALL_LIB_DIR_CM24)
+ LIBRARY DESTINATION ${OTB_INSTALL_APP_DIR_CM24})
+
endmacro(OTB_CREATE_APPLICATION)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1da4015ebf..015d33d547 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,6 +152,14 @@ IF(NOT OTB_INSTALL_LIB_DIR)
SET(OTB_INSTALL_LIB_DIR "/lib/otb")
ENDIF(NOT OTB_INSTALL_LIB_DIR)
+IF(NOT OTB_INSTALL_APP_DIR)
+ SET(OTB_INSTALL_APP_DIR "/lib/otbapp")
+ENDIF(NOT OTB_INSTALL_APP_DIR)
+
+IF(NOT OTB_INSTALL_LIB_DIR)
+ SET(OTB_INSTALL_LIB_DIR "/lib/otb")
+ENDIF(NOT OTB_INSTALL_LIB_DIR)
+
IF(NOT OTB_INSTALL_DATA_DIR)
SET(OTB_INSTALL_DATA_DIR "/share/otb")
ENDIF(NOT OTB_INSTALL_DATA_DIR)
@@ -193,6 +201,7 @@ ENDIF(OTB_BUILD_SHARED_LIBS)
# are stripping the leading /. In the future, there should be no leading
# / in any install directory variables
STRING(REGEX REPLACE "^/" "" OTB_INSTALL_LIB_DIR_CM24 "${OTB_INSTALL_LIB_DIR}")
+STRING(REGEX REPLACE "^/" "" OTB_INSTALL_APP_DIR_CM24 "${OTB_INSTALL_APP_DIR}")
STRING(REGEX REPLACE "^/" "" OTB_INSTALL_BIN_DIR_CM24 "${OTB_INSTALL_BIN_DIR}")
STRING(REGEX REPLACE "^/" "" OTB_INSTALL_INCLUDE_DIR_CM24 "${OTB_INSTALL_INCLUDE_DIR}")
STRING(REGEX REPLACE "^/" "" OTB_INSTALL_PACKAGE_DIR_CM24 "${OTB_INSTALL_PACKAGE_DIR}")
--
GitLab