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

BUG: fix issue #457. do not mix ITK_AUTOLOAD_PATH from build tree and install tree

parent d21ddfdb
No related branches found
No related tags found
No related merge requests found
#!/bin/bash
#
# Autogenerated by OTB installation process
# DO NOT MODIFY
#
CURRENT_SCRIPT_DIR=`dirname $0`
if [ -e $CURRENT_SCRIPT_DIR/otbApplicationLauncherCommandLine ]
then
# Prefer using the launcher inside the script dir
OTB_CLI_LAUNCHER=$CURRENT_SCRIPT_DIR/otbApplicationLauncherCommandLine
else
# Use the one from the PATH
OTB_CLI_LAUNCHER=otbApplicationLauncherCommandLine
fi
# works for build dir
if [ -d @APPLICATION_BINARY_PATH@ ]
then
ITK_AUTOLOAD_PATH=@APPLICATION_BINARY_PATH@:$ITK_AUTOLOAD_PATH
fi
# export it to make it available to otbApplicationLauncherCommandLine environment
export ITK_AUTOLOAD_PATH
# start the application
$OTB_CLI_LAUNCHER "$@"
...@@ -16,12 +16,6 @@ else ...@@ -16,12 +16,6 @@ else
OTB_CLI_LAUNCHER=otbApplicationLauncherCommandLine OTB_CLI_LAUNCHER=otbApplicationLauncherCommandLine
fi fi
# works for build dir
if [ -d @APPLICATION_BINARY_PATH@ ]
then
ITK_AUTOLOAD_PATH=@APPLICATION_BINARY_PATH@:$ITK_AUTOLOAD_PATH
fi
# works for install tree # works for install tree
if [ -d $CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR_CM24@ ] if [ -d $CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR_CM24@ ]
then then
......
#!/bin/bash
#
# Autogenerated by OTB installation process
# DO NOT MODIFY
#
CURRENT_SCRIPT_DIR=`dirname $0`
if [ -e $CURRENT_SCRIPT_DIR/otbApplicationLauncherQt ]
then
# Prefer using the launcher inside the script dir
OTB_GUI_LAUNCHER=$CURRENT_SCRIPT_DIR/otbApplicationLauncherQt
else
# Use the one from the PATH
OTB_GUI_LAUNCHER=otbApplicationLauncherQt
fi
# use the buildtree path to applications
if [ -d @APPLICATION_BINARY_PATH@ ]
then
ITK_AUTOLOAD_PATH=@APPLICATION_BINARY_PATH@:$ITK_AUTOLOAD_PATH
fi
# export it to make it available to otbApplicationLauncherCommandLine environment
export ITK_AUTOLOAD_PATH
# start the application
$OTB_GUI_LAUNCHER "$@"
...@@ -16,13 +16,7 @@ else ...@@ -16,13 +16,7 @@ else
OTB_GUI_LAUNCHER=otbApplicationLauncherQt OTB_GUI_LAUNCHER=otbApplicationLauncherQt
fi fi
# works for build dir # use the default install tree path for applications
if [ -d @APPLICATION_BINARY_PATH@ ]
then
ITK_AUTOLOAD_PATH=@APPLICATION_BINARY_PATH@:$ITK_AUTOLOAD_PATH
fi
# works for install tree
if [ -d $CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR_CM24@ ] if [ -d $CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR_CM24@ ]
then then
ITK_AUTOLOAD_PATH=$CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR_CM24@:$ITK_AUTOLOAD_PATH ITK_AUTOLOAD_PATH=$CURRENT_SCRIPT_DIR/../@OTB_INSTALL_APP_DIR_CM24@:$ITK_AUTOLOAD_PATH
......
...@@ -25,12 +25,17 @@ set(APPLICATION_BINARY_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) ...@@ -25,12 +25,17 @@ set(APPLICATION_BINARY_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
# Generate a script in the build dir, next to the cli launcher # Generate a script in the build dir, next to the cli launcher
# Need a two-step process since configure_file don't support permissions # Need a two-step process since configure_file don't support permissions
configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbgui.sh.in file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/buildtree)
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/otbgui configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbgui.sh.buildtree.in
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/buildtree/otbgui
@ONLY ) @ONLY )
file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/otbgui file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/otbgui
DESTINATION ${CLI_OUPUT_DIR} DESTINATION ${CLI_OUPUT_DIR}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install(PROGRAMS ${CLI_OUPUT_DIR}/otbgui file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree)
configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbgui.sh.installtree.in
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbgui
@ONLY )
install(PROGRAMS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbgui
DESTINATION ${OTB_INSTALL_BIN_DIR_CM24}) DESTINATION ${OTB_INSTALL_BIN_DIR_CM24})
...@@ -31,17 +31,21 @@ install(TARGETS otbApplicationLauncherCommandLine ...@@ -31,17 +31,21 @@ install(TARGETS otbApplicationLauncherCommandLine
get_target_property(CLI_OUPUT_DIR otbApplicationLauncherCommandLine RUNTIME_OUTPUT_DIRECTORY) get_target_property(CLI_OUPUT_DIR otbApplicationLauncherCommandLine RUNTIME_OUTPUT_DIRECTORY)
# What is the path to the applications # What is the path to the applications
# a MODULE target is always treated as LIBRARY
set(APPLICATION_BINARY_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) set(APPLICATION_BINARY_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
# Generate a script in the build dir, next to the cli launcher # Generate a script in the build dir, next to the cli launcher
# Need a two-step process since configure_file don't support permissions # Need a two-step process since configure_file don't support permissions
configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbcli.sh.in file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/buildtree)
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/otbcli configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbcli.sh.buildtree.in
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/buildtree/otbcli
@ONLY ) @ONLY )
file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/otbcli file(COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/buildtree/otbcli
DESTINATION ${CLI_OUPUT_DIR} DESTINATION ${CLI_OUPUT_DIR}
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install(PROGRAMS ${CLI_OUPUT_DIR}/otbcli file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree)
configure_file( ${CMAKE_SOURCE_DIR}/CMake/otbcli.sh.installtree.in
${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbcli
@ONLY )
install(PROGRAMS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/Scripts/installtree/otbcli
DESTINATION ${OTB_INSTALL_BIN_DIR_CM24}) DESTINATION ${OTB_INSTALL_BIN_DIR_CM24})
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