diff --git a/CMake/WrapperMacros.cmake b/CMake/WrapperMacros.cmake index cfa6258d2d6aab14c44c4bc4ff9e72aaac064f42..949b44bfcd9bb42a4be0bb2916216e56a64d708e 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 1da4015ebf64540427252eb06655dd2372b6d777..015d33d5477510f8696378486f8372644db6a60c 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}")