diff --git a/SuperBuild/CMake/External_geotiff.cmake b/SuperBuild/CMake/External_geotiff.cmake index c3810448182d0e0ae7fce8aa89c4cd5ce15bfb76..d343c0288fba73da1f2f3a8b97d2eb49e7837e3b 100644 --- a/SuperBuild/CMake/External_geotiff.cmake +++ b/SuperBuild/CMake/External_geotiff.cmake @@ -45,8 +45,8 @@ else() ExternalProject_Add(${proj} PREFIX ${proj} - URL "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.0.tar.gz" - URL_MD5 efa7b418bc00228fcda4da63557e40c2 + URL "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.1.tar.gz" + URL_MD5 48bdf817e6e7a37671cc1f41b01e10fc BINARY_DIR ${GEOTIFF_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} @@ -70,8 +70,8 @@ else() else() ExternalProject_Add(${proj} PREFIX ${proj} - URL "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.0.tar.gz" - URL_MD5 efa7b418bc00228fcda4da63557e40c2 + URL "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.4.1.tar.gz" + URL_MD5 48bdf817e6e7a37671cc1f41b01e10fc BINARY_DIR ${GEOTIFF_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} @@ -85,9 +85,9 @@ else() BUILD_COMMAND $(MAKE) bin_PROGRAMS= INSTALL_COMMAND $(MAKE) install bin_PROGRAMS= DEPENDS ${${proj}_DEPENDENCIES} - PATCH_COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/patches/${proj}/configure - ${GEOTIFF_SB_SRC} + #PATCH_COMMAND ${CMAKE_COMMAND} -E copy + # ${CMAKE_SOURCE_DIR}/patches/${proj}/configure + # ${GEOTIFF_SB_SRC} ) ExternalProject_Add_Step(${proj} copy_source diff --git a/SuperBuild/CMake/External_itk.cmake b/SuperBuild/CMake/External_itk.cmake index 49e2d607eb9059e39a56d4af0b579ab535273d8b..a82c98a9bf1ae9b347b69d7fdc2dda1ed0c8d0c0 100644 --- a/SuperBuild/CMake/External_itk.cmake +++ b/SuperBuild/CMake/External_itk.cmake @@ -150,8 +150,8 @@ else() ExternalProject_Add(${proj} PREFIX ${proj} - URL "http://sourceforge.net/projects/itk/files/itk/4.8/InsightToolkit-4.8.0.tar.gz/download" - URL_MD5 2d62f628d9e96cc790fa37947a0f9bc3 + URL "http://sourceforge.net/projects/itk/files/itk/4.8/InsightToolkit-4.8.1.tar.gz/download" + URL_MD5 b1ed53604de854501cb61f34f410420e SOURCE_DIR ${ITK_SB_SRC} BINARY_DIR ${ITK_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} diff --git a/SuperBuild/CMake/External_muparser.cmake b/SuperBuild/CMake/External_muparser.cmake index e513503edd0d16407734ba5cf2a64aafaff18d19..99e205c824a3344212705029cd4296ace3205198 100644 --- a/SuperBuild/CMake/External_muparser.cmake +++ b/SuperBuild/CMake/External_muparser.cmake @@ -14,9 +14,8 @@ else() ExternalProject_Add(${proj} PREFIX ${proj} - DOWNLOAD_NAME muparser_v2_2_3.zip - URL "https://docs.google.com/uc?export=download&id=0BzuB-ydOOoduLUNRanpDNV9iVk0" - URL_MD5 9de40ec1dab5bd2787ee344fce5846ad + URL "https://github.com/beltoforion/muparser/archive/v2.2.5.tar.gz" + URL_MD5 02dae671aa5ad955fdcbcd3fee313fb7 BINARY_DIR ${MUPARSER_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} diff --git a/SuperBuild/CMake/External_opencv.cmake b/SuperBuild/CMake/External_opencv.cmake index 6fa01c6bcaec3d1fe60c741a58da74359bbd9876..d402b50cfd0dd0cd1e9a15b0b8a2d092b9be154f 100644 --- a/SuperBuild/CMake/External_opencv.cmake +++ b/SuperBuild/CMake/External_opencv.cmake @@ -28,8 +28,8 @@ else() ExternalProject_Add(${proj} PREFIX ${proj} - URL "http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.10/opencv-2.4.10.zip/download" - URL_MD5 ec63952d3a3dff965d5fdde765926821 + URL "http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.11/opencv-2.4.11.zip/download" + URL_MD5 32f498451bff1817a60e1aabc2939575 BINARY_DIR ${OPENCV_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} diff --git a/SuperBuild/CMake/External_openssl.cmake b/SuperBuild/CMake/External_openssl.cmake index 0d8c2c8fb2fd3c6ef905468ca85c31bffe3a32e9..20590d1c99ea39da1c90fc3f417eb67c0585f50f 100644 --- a/SuperBuild/CMake/External_openssl.cmake +++ b/SuperBuild/CMake/External_openssl.cmake @@ -33,8 +33,8 @@ else() STRING(REGEX REPLACE "/" "\\\\" CMAKE_WIN_INSTALL_PREFIX ${CMAKE_WIN_INSTALL_PREFIX}) ExternalProject_Add(${proj} PREFIX ${proj} - URL "https://github.com/openssl/openssl/archive/OpenSSL_1_0_1e.zip" - URL_MD5 de0f06b07dad7ec8b220336530be1feb + URL "https://github.com/openssl/openssl/archive/OpenSSL_1_0_1p.tar.gz" + URL_MD5 6bc1f9a9d9d474aceceb377e758e48ec DEPENDS ${${proj}_DEPENDENCIES} BINARY_DIR ${OPENSSL_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} @@ -49,8 +49,8 @@ else() ExternalProject_Add(${proj} PREFIX ${proj} DEPENDS ${${proj}_DEPENDENCIES} - URL "https://github.com/openssl/openssl/archive/OpenSSL_1_0_1e.zip" - URL_MD5 de0f06b07dad7ec8b220336530be1feb + URL "https://github.com/openssl/openssl/archive/OpenSSL_1_0_1p.tar.gz" + URL_MD5 6bc1f9a9d9d474aceceb377e758e48ec BINARY_DIR ${OPENSSL_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} diff --git a/SuperBuild/CMake/External_ossim.cmake b/SuperBuild/CMake/External_ossim.cmake index 0eeadf596dfc93f745640f85decb1691ad2b36d7..7b08af7661f549b528c0bbba00e4b4565504f495 100644 --- a/SuperBuild/CMake/External_ossim.cmake +++ b/SuperBuild/CMake/External_ossim.cmake @@ -48,13 +48,14 @@ else() # archive version ExternalProject_Add(${proj} PREFIX ${proj} - URL "https://www.orfeo-toolbox.org/packages/ossim-minimal-r23537.tar.gz" - URL_MD5 f77d574ab2817bcc36633f77824facb5 + URL "http://download.osgeo.org/ossim/source/ossim-1.8.20/ossim-1.8.20-1.tar.gz" + URL_MD5 19bd40f12d65c2e5b2963466dc838854 BINARY_DIR ${OSSIM_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} - CMAKE_CACHE_ARGS + CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${OSSIM_SB_SRC}/ossim -DProject_WC_REVISION:STRING=23537 + -DSUBVERSION_FOUND:BOOL=FALSE -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_FLAGS:STRING=${OSSIM_CXX_FLAGS} @@ -63,25 +64,24 @@ else() -DBUILD_OSSIM_APPS:BOOL=OFF -DBUILD_OSSIM_TEST_APPS:BOOL=OFF -DBUILD_OSSIM_FRAMEWORKS:BOOL=OFF - -DBUILD_WMS:BOOL=OFF -DINSTALL_ARCHIVE_DIR:STRING=lib -DINSTALL_LIBRARY_DIR:STRING=lib + -DCMAKE_MODULE_PATH:PATH=${OSSIM_SB_SRC}/ossim_package_support/cmake/CMakeModules -DCMAKE_PREFIX_PATH:STRING=${SB_INSTALL_PREFIX};${CMAKE_PREFIX_PATH} ${OSSIM_SB_CONFIG} DEPENDS ${${proj}_DEPENDENCIES} - CMAKE_COMMAND ${SB_CMAKE_COMMAND} ) if(MSVC) ExternalProject_Add_Step(${proj} patch_ossim_src COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_SOURCE_DIR}/patches/ossim/src ${OSSIM_SB_SRC}/src + ${CMAKE_SOURCE_DIR}/patches/ossim/src ${OSSIM_SB_SRC}/ossim/src DEPENDEES patch_ossim_include DEPENDERS configure ) ExternalProject_Add_Step(${proj} patch_ossim_include COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_SOURCE_DIR}/patches/ossim/include ${OSSIM_SB_SRC}/include + ${CMAKE_SOURCE_DIR}/patches/ossim/include ${OSSIM_SB_SRC}/ossim/include DEPENDEES patch DEPENDERS patch_ossim_src ) endif() diff --git a/SuperBuild/CMake/External_qt4.cmake b/SuperBuild/CMake/External_qt4.cmake index 8a96a881c4fa787c7929babfebee8bcfa3f0c597..dfa83f41340badd9772eaf5dc9801d6d7b063177 100644 --- a/SuperBuild/CMake/External_qt4.cmake +++ b/SuperBuild/CMake/External_qt4.cmake @@ -39,8 +39,8 @@ else() ExternalProject_Add(${proj} PREFIX ${proj} - URL "http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz" - URL_MD5 2edbe4d6c2eff33ef91732602f3518eb + URL "http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz" + URL_MD5 d990ee66bf7ab0c785589776f35ba6ad BINARY_DIR ${QT4_SB_SRC} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} @@ -60,8 +60,8 @@ else() else() ExternalProject_Add(${proj} PREFIX ${proj} - URL "http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz" - URL_MD5 2edbe4d6c2eff33ef91732602f3518eb + URL "http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz" + URL_MD5 d990ee66bf7ab0c785589776f35ba6ad BINARY_DIR ${QT4_SB_SRC} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} diff --git a/SuperBuild/CMake/External_swig.cmake b/SuperBuild/CMake/External_swig.cmake index ec2faec767f6a4c4294d565ec2a45bf2fecf76aa..7bbd88cb150969a69563235df3d281bc31426509 100644 --- a/SuperBuild/CMake/External_swig.cmake +++ b/SuperBuild/CMake/External_swig.cmake @@ -34,8 +34,8 @@ else() # Use pre-built swig executable (no linking is required, no install done) ExternalProject_Add(${proj} PREFIX ${proj} - URL "http://sourceforge.net/projects/swig/files/swigwin/swigwin-3.0.5/swigwin-3.0.5.zip/download" - URL_MD5 fd2e050f29e2a00b2348f5f7d3476490 + URL "http://sourceforge.net/projects/swig/files/swigwin/swigwin-3.0.7/swigwin-3.0.7.zip/download" + URL_MD5 d8b5a9ce49c819cc1bfc1e797b85ba7a INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND "" @@ -56,8 +56,8 @@ else() ExternalProject_Add(${proj} PREFIX ${proj} - URL "http://sourceforge.net/projects/swig/files/swig/swig-3.0.5/swig-3.0.5.tar.gz/download" - URL_MD5 dcb9638324461b9baba8e044fe59031d + URL "http://sourceforge.net/projects/swig/files/swig/swig-3.0.7/swig-3.0.7.tar.gz/download" + URL_MD5 7fff46c84b8c630ede5b0f0827e3d90a BINARY_DIR ${SWIG_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} diff --git a/SuperBuild/CMake/External_tiff.cmake b/SuperBuild/CMake/External_tiff.cmake index 207edfd197822d9bb5230db665dc32e748d872d5..143f349e2e4462c952f64a961cd4f100371fc99b 100644 --- a/SuperBuild/CMake/External_tiff.cmake +++ b/SuperBuild/CMake/External_tiff.cmake @@ -37,8 +37,8 @@ else() ExternalProject_Add(${proj}_build PREFIX ${proj} - URL "http://download.osgeo.org/libtiff/tiff-4.0.3.tar.gz" - URL_MD5 051c1068e6a0627f461948c365290410 + URL "http://download.osgeo.org/libtiff/tiff-4.0.6.tar.gz" + URL_MD5 d1d2e940dea0b5ad435f21f03d96dd72 SOURCE_DIR ${TIFF_SB_SRC} BINARY_DIR ${TIFF_SB_SRC} INSTALL_DIR ${SB_INSTALL_PREFIX} @@ -69,8 +69,8 @@ else() else() ExternalProject_Add(${proj} PREFIX ${proj} - URL "http://download.osgeo.org/libtiff/tiff-4.0.3.tar.gz" - URL_MD5 051c1068e6a0627f461948c365290410 + URL "http://download.osgeo.org/libtiff/tiff-4.0.6.tar.gz" + URL_MD5 d1d2e940dea0b5ad435f21f03d96dd72 BINARY_DIR ${TIFF_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION}