Skip to content
Snippets Groups Projects
Commit 0e961574 authored by Thibaut ROMAIN's avatar Thibaut ROMAIN
Browse files

Merge branch 'develop' into 'spot5-support-otb9'

# Conflicts:
#   .gitlab-ci.yml
#   SuperBuild/CMake/External_jpeg.cmake
parents 490d0720 c02e6d05
No related branches found
No related tags found
1 merge request!1015Add Spot5 SWH support to otb9
Pipeline #15975 passed with warnings
......@@ -237,7 +237,7 @@ redhat-build:
# Obviously Windows does not use same executable name as linux...
after_script:
# need to setup path to be able to use python
- . "CI\setup_python.ps1" x64
- .\CI\setup_python.ps1 x64
- python -u CI/cdash_handler.py
# - Win10
......
......@@ -151,6 +151,18 @@ if(ci_skip_testing)
message(STATUS "Skip testing")
set(_test_rv 0)
else()
if (WIN32)
# since we are using powershell 7 on Windobe, these tests fails with non sense
# error.
# The two appTvDomain fails with "Program exited abnormally with exception type 1 : Access violation" error
# Three other test are in segfault
set(CTEST_CUSTOM_TESTS_IGNORE apTvDomainTransform_fft_shift_fwd
apTvDomainTransform_fft_inv
bfTvOverlapSaveConvolutionImageFilter
bfTvCompareOverlapSaveAndClassicalConvolutionWithGaborFilter
feTvForwardFourierMellinImageFilter)
endif()
ctest_test(PARALLEL_LEVEL 8
RETURN_VALUE _test_rv
CAPTURE_CMAKE_ERROR _test_error
......
......@@ -38,8 +38,8 @@ set(JPEG_CONFIGURE_COMMAND "${SB_CMAKE_COMMAND}"
ExternalProject_Add(JPEG
PREFIX JPEG
URL "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/2.0.0/libjpeg-turbo-2.0.0.tar.gz"
URL_MD5 b12a3fcf1d078db38410f27718a91b83
URL "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz"
URL_MD5 fdeae6d78ca577a37857f2d14e33adbe
SOURCE_DIR ${JPEG_SB_SRC}
BINARY_DIR ${JPEG_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
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