Skip to content
Snippets Groups Projects
Commit c46cd2ed authored by Julien Malik's avatar Julien Malik
Browse files

COMP: fix install of Applications

parent 8e9a889f
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......@@ -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}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment