Commit 2f51a929 authored by Guillaume Pasero's avatar Guillaume Pasero

Merge branch 'refac_download_srtm' into develop

parents f73f652e b0105aa4
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -24,7 +24,7 @@ otb_test_application(NAME apTuUtDownloadSRTMTiles
APP DownloadSRTMTiles
OPTIONS -il LARGEINPUT{QUICKBIRD/TOULOUSE/000000128955_01_P001_MUL/02APR01105228-M1BS-000000128955_01_P001.TIF}
-mode list
-mode.list.indir ${INPUTDATA}/DEM/srtm_directory
-tiledir ${INPUTDATA}/DEM/srtm_directory
)
......
......@@ -24,14 +24,30 @@ SETUP_SUPERBUILD(CURL)
# declare dependencies
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(CURL ZLIB)
if(NOT APPLE)
if(NOT APPLE AND NOT WIN32)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(CURL OPENSSL)
ADD_SUPERBUILD_CMAKE_VAR(CURL OPENSSL_INCLUDE_DIR)
ADD_SUPERBUILD_CMAKE_VAR(CURL OPENSSL_SSL_LIBRARY)
ADD_SUPERBUILD_CMAKE_VAR(CURL OPENSSL_CRYPTO_LIBRARY)
list(APPEND CURL_SB_CONFIG
-DCMAKE_USE_OPENSSL:BOOL=ON
-DCMAKE_C_FLAGS:STRING=-fPIC)
elseif(APPLE)
list(APPEND CURL_SB_CONFIG
-DCMAKE_USE_DARWINSSL:BOOL=ON
-DHAVE_LIBNETWORK:STRING=0
-DCMAKE_C_FLAGS:STRING=-fPIC)
elseif(WIN32)
list(APPEND CURL_SB_CONFIG
-DCMAKE_USE_WINSSL:BOOL=ON
-DCURL_WINDOWS_SSPI:BOOL=ON
-DHAVE_INET_PTON:STRING=0)
endif()
ExternalProject_Add(CURL
PREFIX CURL
URL "http://curl.haxx.se/download/curl-7.40.0.tar.gz"
URL_MD5 58943642ea0ed050ab0431ea1caf3a6f
URL "http://curl.haxx.se/download/curl-7.54.1.tar.gz"
URL_MD5 21a6e5658fd55103a90b11de7b2a8a8c
BINARY_DIR ${CURL_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
......@@ -39,12 +55,40 @@ ExternalProject_Add(CURL
${SB_CMAKE_CACHE_ARGS}
-DBUILD_CURL_TESTS:BOOL=OFF
-DBUILD_CURL_EXE:BOOL=ON
-DCMAKE_USE_OPENSSL:BOOL=OFF
-DBUILD_DASHBOARD_REPORTS:BOOL=OFF
-DBUILD_RELEASE_DEBUG_DIRS:BOOL=OFF
-DCMAKE_USE_GSSAPI:BOOL=OFF
-DCMAKE_USE_LIBSSH2:BOOL=OFF
-DCURL_DISABLE_LDAP:BOOL=ON
-DCMAKE_USE_OPENLDAP:BOOL=OFF
-DENABLE_MANUAL:BOOL=OFF
-DCMAKE_USE_MBEDTLS:BOOL=OFF
-DCURL_DISABLE_COOKIES:BOOL=OFF
-DCURL_DISABLE_CRYPTO_AUTH:BOOL=OFF
-DCURL_DISABLE_DICT:BOOL=ON
-DCURL_DISABLE_FILE:BOOL=OFF
-DCURL_DISABLE_FTP:BOOL=OFF
-DCURL_DISABLE_GOPHER:BOOL=ON
-DCURL_DISABLE_HTTP:BOOL=OFF
-DCURL_DISABLE_IMAP:BOOL=ON
-DCURL_DISABLE_LDAP:BOOL=ON
-DCURL_DISABLE_LDAPS:BOOL=ON
-DCURL_DISABLE_POP3:BOOL=ON
-DCURL_DISABLE_PROXY:BOOL=OFF
-DCURL_DISABLE_RTSP:BOOL=ON
-DCURL_DISABLE_SMTP:BOOL=ON
-DCURL_DISABLE_TELNET:BOOL=ON
-DCURL_DISABLE_TFTP:BOOL=ON
-DCURL_DISABLE_VERBOSE_STRINGS:BOOL=OFF
-DCURL_HIDDEN_SYMBOLS:BOOL=OFF
-DCURL_STATICLIB:BOOL=OFF
-DDISABLED_THREADSAFE:BOOL=OFF
-DENABLE_ARES:BOOL=OFF
-DENABLE_CURLDEBUG:BOOL=OFF
-DENABLE_DEBUG:BOOL=OFF
-DENABLE_IPV6:BOOL=OFF
-DENABLE_UNIX_SOCKETS:BOOL=OFF
-DENABLE_MANUAL:BOOL=OFF
-DHTTP_ONLY:BOOL=OFF
-DUSE_WIN32_LDAP:BOOL=OFF
${CURL_SB_CONFIG}
DEPENDS ${CURL_DEPENDENCIES}
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
......@@ -54,7 +98,7 @@ ExternalProject_Add(CURL
LOG_INSTALL 1
)
SUPERBUILD_PATCH_SOURCE(CURL)
# SUPERBUILD_PATCH_SOURCE(CURL)
set(_SB_CURL_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
......
......@@ -104,5 +104,6 @@ set(_SB_OPENSSL_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
set(_SB_OPENSSL_LIBRARY "${SB_INSTALL_PREFIX}/lib/ssleay32.lib;${SB_INSTALL_PREFIX}/lib/libeay32.lib")
elseif(UNIX)
set(_SB_OPENSSL_LIBRARY ${SB_INSTALL_PREFIX}/lib/libssl${CMAKE_SHARED_LIBRARY_SUFFIX})
set(_SB_OPENSSL_SSL_LIBRARY ${SB_INSTALL_PREFIX}/lib/libssl${CMAKE_SHARED_LIBRARY_SUFFIX})
set(_SB_OPENSSL_CRYPTO_LIBRARY ${SB_INSTALL_PREFIX}/lib/libcrypto${CMAKE_SHARED_LIBRARY_SUFFIX})
endif()
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