diff --git a/CI/build.sh b/CI/build.sh index aeffa06afcc19ca0cb6d1205c6e0a36346db14d9..4470ad63aa417d284ab8ad3de5d39b2d9154ca60 100755 --- a/CI/build.sh +++ b/CI/build.sh @@ -2,11 +2,11 @@ export TOP_DIR=$(pwd) -# curl -s -S -L -o otb-data-master.tar.gz \ -# https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-data/-/archive/master/otb-data-master.tar.gz -# tar xzf otb-data-master.tar.gz -# mv otb-data-master otb-data -# rm -f otb-data-master.tar.gz +curl -s -S -L -o otb-data-master.tar.gz \ + https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb-data/-/archive/master/otb-data-master.tar.gz +tar xzf otb-data-master.tar.gz +mv otb-data-master otb-data +rm -f otb-data-master.tar.gz ctest -VV -S CI/main_ci.cmake diff --git a/CI/configure_option.cmake b/CI/configure_option.cmake index dd457e443f3390fdebd4c868acac8bbc1e02f2c8..b8ddf48bd4469bc6b75e7b010e2f6325bd0afdf7 100644 --- a/CI/configure_option.cmake +++ b/CI/configure_option.cmake @@ -47,13 +47,14 @@ OTB_DATA_LARGEINPUT_ROOT:PATH=${OTB_LARGEINPUT_ROOT}") string (REPLACE "\n" ";" otb_build_project_option ${otb_build_project_option}) string (REPLACE "\n" ";" otb_use_option ${otb_use_option}) string (REPLACE "\n" ";" otb_wrap_option ${otb_wrap_option}) +string (REPLACE "\n" ";" otb_data_option ${otb_data_option}) set (otb_options "") list (APPEND otb_options ${otb_build_project_option}) list (APPEND otb_options ${otb_use_option}) list (APPEND otb_options ${otb_wrap_option}) - +list (APPEND otb_options ${otb_data_option}) foreach(option ${otb_options}) set( CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS}-D${option};") -endforeach(option) \ No newline at end of file +endforeach(option)