Commit ddd400b6 authored by Julien Osman's avatar Julien Osman
Browse files

Merge branch 'develop' into integration-release-7.3

parents dcdc981d bc0cb8dd
Pipeline #7928 failed with stages
in 94 minutes and 9 seconds
......@@ -46,22 +46,22 @@ set( boost_libraries_to_build "system;serialization;filesystem;test;date_time;pr
# add libraries to b2 option
set(BOOST_SB_CONFIG)
foreach(lib ${boost_libraries_to_build})
set(BOOST_SB_CONFIG
set(BOOST_SB_CONFIG
${BOOST_SB_CONFIG}
--with-${lib})
endforeach(lib)
# This is needed because otherwise boost is building both x32 and x64 lib
# This is needed because otherwise boost is building both x32 and x64 lib
# (on wndows) and during packages on win32 we are installing all libs.
# See Packaging/install_importlibs.cmake
if ( WIN32 )
if(OTB_TARGET_SYSTEM_ARCH_IS_X64)
set(BOOST_SB_CONFIG
set(BOOST_SB_CONFIG
${BOOST_SB_CONFIG}
address-model=64)
else()
set(BOOST_SB_CONFIG
set(BOOST_SB_CONFIG
${BOOST_SB_CONFIG}
address-model=32)
endif()
......@@ -89,7 +89,7 @@ set(BOOST_BUILD_COMMAND ${CMAKE_COMMAND}
#NOTE: update _SB_Boost_INCLUDE_DIR below when you change version number
ExternalProject_Add(BOOST
PREFIX BOOST
URL "http://downloads.sourceforge.net/project/boost/boost/1.69.0/boost_1_69_0.tar.bz2"
URL "https://downloads.sourceforge.net/project/boost/boost/1.69.0/boost_1_69_0.tar.bz2"
URL_MD5 a1332494397bf48332cb152abfefcec2
BINARY_DIR ${BOOST_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......@@ -100,7 +100,7 @@ ExternalProject_Add(BOOST
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
LOG_BUILD 1
LOG_INSTALL 1
LOG_INSTALL 1
)
#HINT: avoid all uses of _SB_* in External_<project>.cmake
......
......@@ -32,7 +32,7 @@ if(NOT APPLE AND NOT WIN32)
list(APPEND CURL_SB_CONFIG
-DCMAKE_USE_OPENSSL:BOOL=ON
-DCMAKE_C_FLAGS:STRING=-fPIC)
# Set CURL_CA_PATH to none because openssl in not enabled and CMake generation will fail if
# Set CURL_CA_PATH to none because openssl in not enabled and CMake generation will fail if
# a CA path is found in auto mode.
elseif(APPLE)
list(APPEND CURL_SB_CONFIG
......@@ -50,7 +50,7 @@ endif()
ExternalProject_Add(CURL
PREFIX CURL
URL "http://curl.haxx.se/download/curl-7.54.1.tar.gz"
URL "https://curl.haxx.se/download/curl-7.54.1.tar.gz"
URL_MD5 21a6e5658fd55103a90b11de7b2a8a8c
BINARY_DIR ${CURL_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -24,7 +24,7 @@ SETUP_SUPERBUILD(EXPAT)
ExternalProject_Add(EXPAT
PREFIX EXPAT
URL "http://downloads.sourceforge.net/project/expat/expat/2.4.1/expat-2.4.1.tar.gz"
URL "https://downloads.sourceforge.net/project/expat/expat/2.4.1/expat-2.4.1.tar.gz"
URL_MD5 8738ef9ed1c5dcc03207286ea84f4299
BINARY_DIR ${EXPAT_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -36,7 +36,7 @@ endif()
# Compile the float version of FFTW
ExternalProject_Add(FFTWF
PREFIX FFTW/FFTWF
URL "http://fftw.org/fftw-3.3.9.tar.gz"
URL "https://fftw.org/fftw-3.3.9.tar.gz"
URL_MD5 50145bb68a8510b5d77605f11cadf8dc
SOURCE_DIR ${FFTWF_SB_SRC}
BINARY_DIR ${FFTWF_SB_BUILD}
......@@ -61,7 +61,7 @@ ExternalProject_Add(FFTWF
# Compile the double version of FFTW
ExternalProject_Add(FFTWD
PREFIX FFTW/FFTWD
URL "http://fftw.org/fftw-3.3.9.tar.gz"
URL "https://fftw.org/fftw-3.3.9.tar.gz"
URL_MD5 50145bb68a8510b5d77605f11cadf8dc
SOURCE_DIR ${FFTWD_SB_SRC}
BINARY_DIR ${FFTWD_SB_BUILD}
......
......@@ -24,7 +24,7 @@ SETUP_SUPERBUILD(GEOS)
ExternalProject_Add(GEOS
PREFIX GEOS
URL "http://download.osgeo.org/geos/geos-3.6.5.tar.bz2"
URL "https://download.osgeo.org/geos/geos-3.6.5.tar.bz2"
URL_MD5 5ddbbe9dbaf0ac45a36856c185c56b23
SOURCE_DIR ${GEOS_SB_SRC}
BINARY_DIR ${GEOS_SB_SRC}
......
......@@ -37,7 +37,7 @@ ADD_SUPERBUILD_CMAKE_VAR(GEOTIFF JPEG_LIBRARY)
ExternalProject_Add(GEOTIFF
PREFIX GEOTIFF
URL "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.5.1.tar.gz"
URL "https://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.5.1.tar.gz"
URL_MD5 6d0fa650c206791bc7d5e60ef625ea77
SOURCE_DIR ${GEOTIFF_SB_SRC}
BINARY_DIR ${GEOTIFF_SB_BUILD_DIR}
......
......@@ -40,13 +40,13 @@ else(MSVC)
${CMAKE_SOURCE_DIR}/patches/GLUT/CMakeLists.txt
${GLUT_SB_SRC}
)
set(GLUT_CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_ARGS} ${SB_CMAKE_CACHE_ARGS} ${GLUT_SB_SRC} )
endif()
ExternalProject_Add(GLUT
PREFIX GLUT
URL "http://downloads.sourceforge.net/project/freeglut/freeglut/2.8.1/freeglut-2.8.1.tar.gz"
URL "https://downloads.sourceforge.net/project/freeglut/freeglut/2.8.1/freeglut-2.8.1.tar.gz"
URL_MD5 918ffbddcffbac83c218bc52355b6d5a
BINARY_DIR ${GLUT_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -32,7 +32,7 @@ set(HDF4_SB_MF_LIB mfhdfalt)
ExternalProject_Add(HDF4
PREFIX HDF4
URL "http://support.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.13.tar.gz"
URL "https://support.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.13.tar.gz"
URL_MD5 a6aa950b3fce5162b96496d8ea0b82bf
SOURCE_DIR ${HDF4_SB_SRC}
BINARY_DIR ${HDF4_SB_BUILD_DIR}
......
......@@ -46,7 +46,7 @@ endif()
ExternalProject_Add(JPEG
PREFIX JPEG
URL "http://downloads.sourceforge.net/project/libjpeg-turbo/1.4.2/libjpeg-turbo-1.4.2.tar.gz"
URL "https://downloads.sourceforge.net/project/libjpeg-turbo/1.4.2/libjpeg-turbo-1.4.2.tar.gz"
URL_MD5 86b0d5f7507c2e6c21c00219162c3c44
SOURCE_DIR ${JPEG_SB_SRC}
BINARY_DIR ${JPEG_SB_BUILD_DIR}
......
......@@ -34,7 +34,7 @@ ADD_SUPERBUILD_CMAKE_VAR(LIBKML Boost_INCLUDE_DIR)
ExternalProject_Add(LIBKML
PREFIX LIBKML
URL "http://ftp.de.debian.org/debian/pool/main/libk/libkml/libkml_1.3.0~r864+dfsg.orig.tar.gz"
URL "https://deb.debian.org/debian/pool/main/libk/libkml/libkml_1.3.0~r864+dfsg.orig.tar.gz"
URL_MD5 487e3c8dd1ad03551e361ab6a1b4e083
BINARY_DIR ${LIBKML_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -47,7 +47,7 @@ endif()
# archive version
ExternalProject_Add(OSSIM
PREFIX OSSIM
URL "http://download.osgeo.org/ossim/source/ossim-1.8.20/ossim-1.8.20-3.tar.gz"
URL "https://download.osgeo.org/ossim/source/ossim-1.8.20/ossim-1.8.20-3.tar.gz"
URL_MD5 eb2265db0d4d9201e255b92317121cfd
BINARY_DIR ${OSSIM_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -30,7 +30,7 @@ ADD_SUPERBUILD_CMAKE_VAR(PNG ZLIB_LIBRARY)
ExternalProject_Add(PNG
PREFIX PNG
URL "http://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.gz"
URL "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.gz"
URL_MD5 6c7519f6c75939efa0ed3053197abd54
BINARY_DIR ${PNG_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -28,7 +28,7 @@ ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(PROJ SQLITE)
ExternalProject_Add(PROJ
DEPENDS ${PROJ_DEPENDENCIES}
PREFIX PROJ
URL "http://download.osgeo.org/proj/proj-6.2.1.tar.gz" # If we update PROJ to v7+, check option PROJ_TESTS!
URL "https://download.osgeo.org/proj/proj-6.2.1.tar.gz" # If we update PROJ to v7+, check option PROJ_TESTS!
URL_MD5 9f874e227d221daf95f7858dc55dfa3e
BINARY_DIR ${PROJ_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -55,7 +55,7 @@ endif()
ExternalProject_Add(QWT
PREFIX QWT
URL "http://downloads.sourceforge.net/project/qwt/qwt/6.1.6/qwt-6.1.6.zip"
URL "https://downloads.sourceforge.net/project/qwt/qwt/6.1.6/qwt-6.1.6.zip"
URL_MD5 5f59c0843484afb1462d21444227d6f6
SOURCE_DIR ${QWT_SB_SRC}
BINARY_DIR ${QWT_SB_SRC}
......
......@@ -24,7 +24,7 @@ SETUP_SUPERBUILD(SQLITE)
ExternalProject_Add(SQLITE
PREFIX SQLITE
URL "http://www.sqlite.org/2015/sqlite-amalgamation-3080801.zip"
URL "https://www.sqlite.org/2015/sqlite-amalgamation-3080801.zip"
URL_MD5 b1cbcbd710bdfd762dc169f1676053b5
SOURCE_DIR ${SQLITE_SB_SRC}
BINARY_DIR ${SQLITE_SB_BUILD_DIR}
......
......@@ -33,7 +33,7 @@ if(MSVC)
# Use pre-built swig executable (no linking is required, no install done)
ExternalProject_Add(SWIG
PREFIX SWIG
URL "http://downloads.sourceforge.net/project/swig/swigwin/swigwin-3.0.12/swigwin-3.0.12.zip"
URL "https://downloads.sourceforge.net/project/swig/swigwin/swigwin-3.0.12/swigwin-3.0.12.zip"
URL_MD5 a49524dad2c91ae1920974e7062bfc93
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
......@@ -52,7 +52,7 @@ else()
ExternalProject_Add(SWIG
PREFIX SWIG
URL "http://downloads.sourceforge.net/project/swig/swig/swig-3.0.12/swig-3.0.12.tar.gz"
URL "https://downloads.sourceforge.net/project/swig/swig/swig-3.0.12/swig-3.0.12.tar.gz"
URL_MD5 82133dfa7bba75ff9ad98a7046be687c
BINARY_DIR ${SWIG_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -24,7 +24,7 @@ SETUP_SUPERBUILD(TINYXML)
ExternalProject_Add(TINYXML
PREFIX TINYXML
URL "http://downloads.sourceforge.net/project/tinyxml/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz"
URL "https://downloads.sourceforge.net/project/tinyxml/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz"
URL_MD5 c1b864c96804a10526540c664ade67f0
BINARY_DIR ${TINYXML_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -26,7 +26,7 @@ SETUP_SUPERBUILD(ZLIB)
# Try official release 1.2.11
ExternalProject_Add(ZLIB
PREFIX ZLIB
URL "http://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.gz"
URL "https://downloads.sourceforge.net/project/libpng/zlib/1.2.11/zlib-1.2.11.tar.gz"
URL_MD5 1c9f62f0778697a09d36121ead88e08e
BINARY_DIR ${ZLIB_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment