Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Main Repositories
otb
Commits
4337cf99
Commit
4337cf99
authored
Feb 14, 2020
by
Cédric Traizet
Browse files
Merge branch 'fix_proj_lib_develop' into 'develop'
Fix proj lib develop See merge request
!690
parents
5a8402b2
072c19e3
Pipeline
#3722
passed with stages
in 71 minutes and 12 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Packaging/Files/otbenv.bash
View file @
4337cf99
...
...
@@ -44,6 +44,7 @@ unset LD_LIBRARY_PATH
PATH
=
$(
cat_path
"
$CURRENT_DIR
/bin"
"
$PATH
"
)
GDAL_DATA
=
$CURRENT_DIR
/share/data
PROJ_LIB
=
$CURRENT_DIR
/share/proj
PYTHONPATH
=
$(
cat_path
"
$CURRENT_DIR
/lib/python"
"
$PYTHONPATH
"
)
OTB_APPLICATION_PATH
=
$(
cat_path
"
$CURRENT_DIR
/lib/otb/applications"
"
$OTB_APPLICATION_PATH
"
)
GDAL_DRIVER_PATH
=
"disable"
...
...
@@ -51,7 +52,7 @@ LC_NUMERIC=C
export
PATH
export
GDAL_DATA
export
GEOTIFF_CSV
export
PROJ_LIB
export
PYTHONPATH
export
OTB_APPLICATION_PATH
export
GDAL_DRIVER_PATH
...
...
Packaging/Files/otbenv.bat
View file @
4337cf99
...
...
@@ -26,6 +26,7 @@ call :prefix_path PYTHONPATH "%CURRENT_SCRIPT_DIR%lib\python"
call
:prefix
_path
OTB_APPLICATION_PATH
"
%CURRENT_SCRIPT_DIR%
lib\otb\applications"
set
GDAL_DATA
=
%CURRENT_SCRIPT_DIR%
share
\data
set
PROJ_LIB
=
%CURRENT_SCRIPT_DIR%
share
\proj
set
GDAL_DRIVER_PATH
=
disable
:: Set numeric locale to C
set
LC_NUMERIC
=
C
...
...
Packaging/Files/otbenv.profile
View file @
4337cf99
...
...
@@ -57,12 +57,14 @@ LC_NUMERIC=C
# set GDAL_DATA variable used by otb application
GDAL_DATA
=
OUT_DIR
/
share
/
gdal
PROJ_LIB
=
OUT_DIR
/
share
/
proj
export
GDAL_DRIVER_PATH
=
disable
# export variables
export
LC_NUMERIC
export
GDAL_DATA
export
GEOTIFF_CSV
export
PROJ_LIB
export
OTB_APPLICATION_PATH
export
PATH
export
PYTHONPATH
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment