From 2184a35138dbfc383e74444f84f032d3a9d89f8a Mon Sep 17 00:00:00 2001 From: Manuel Grizonnet <manuel.grizonnet@orfeo-toolbox.org> Date: Mon, 23 Mar 2015 17:14:49 +0100 Subject: [PATCH] ENH: forward download location to external projects --- SuperBuild/CMake/External_boost.cmake | 2 ++ SuperBuild/CMake/External_curl.cmake | 2 ++ SuperBuild/CMake/External_expat.cmake | 1 + SuperBuild/CMake/External_fftw.cmake | 2 ++ SuperBuild/CMake/External_fltk.cmake | 1 + SuperBuild/CMake/External_gdal.cmake | 2 ++ SuperBuild/CMake/External_geos.cmake | 1 + SuperBuild/CMake/External_geotiff.cmake | 2 ++ SuperBuild/CMake/External_glew.cmake | 2 ++ SuperBuild/CMake/External_glfw.cmake | 1 + SuperBuild/CMake/External_glut.cmake | 1 + SuperBuild/CMake/External_ice.cmake | 1 + SuperBuild/CMake/External_itk.cmake | 1 + SuperBuild/CMake/External_jpeg.cmake | 2 ++ SuperBuild/CMake/External_libkml.cmake | 1 + SuperBuild/CMake/External_monteverdi.cmake | 1 + SuperBuild/CMake/External_monteverdi2.cmake | 1 + SuperBuild/CMake/External_muparser.cmake | 1 + SuperBuild/CMake/External_muparserx.cmake | 1 + SuperBuild/CMake/External_opencv.cmake | 1 + SuperBuild/CMake/External_openjpeg.cmake | 1 + SuperBuild/CMake/External_openthreads.cmake | 2 ++ SuperBuild/CMake/External_ossim.cmake | 2 ++ SuperBuild/CMake/External_otb.cmake | 1 + SuperBuild/CMake/External_pcre.cmake | 1 + SuperBuild/CMake/External_png.cmake | 1 + SuperBuild/CMake/External_proj.cmake | 3 +++ SuperBuild/CMake/External_qt4.cmake | 2 ++ SuperBuild/CMake/External_qwt.cmake | 1 + SuperBuild/CMake/External_sqlite.cmake | 2 ++ SuperBuild/CMake/External_swig.cmake | 2 ++ SuperBuild/CMake/External_tiff.cmake | 3 +++ SuperBuild/CMake/External_tinyxml.cmake | 1 + SuperBuild/CMake/External_zlib.cmake | 1 + 34 files changed, 50 insertions(+) diff --git a/SuperBuild/CMake/External_boost.cmake b/SuperBuild/CMake/External_boost.cmake index e6487f2eed..a7be4feb50 100644 --- a/SuperBuild/CMake/External_boost.cmake +++ b/SuperBuild/CMake/External_boost.cmake @@ -37,6 +37,7 @@ else() URL_MD5 efbfbff5a85a9330951f243d0a46e4b9 BINARY_DIR ${BOOST_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release @@ -52,6 +53,7 @@ else() URL_MD5 efbfbff5a85a9330951f243d0a46e4b9 BINARY_DIR ${BOOST_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND ${BOOST_SB_BUILD_DIR}/bootstrap.sh --prefix=${SB_INSTALL_PREFIX} diff --git a/SuperBuild/CMake/External_curl.cmake b/SuperBuild/CMake/External_curl.cmake index ca4c551807..b9cbc0bd07 100644 --- a/SuperBuild/CMake/External_curl.cmake +++ b/SuperBuild/CMake/External_curl.cmake @@ -32,6 +32,7 @@ else() SOURCE_DIR ${CURL_SB_SRC} BINARY_DIR ${CURL_SB_BUILD_DIR}/winbuild INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CURL_SB_SRC} ${CURL_SB_BUILD_DIR} CONFIGURE_COMMAND "" @@ -46,6 +47,7 @@ else() URL_MD5 58943642ea0ed050ab0431ea1caf3a6f BINARY_DIR ${CURL_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_PREFIX_PATH:STRING=${SB_INSTALL_PREFIX};${CMAKE_PREFIX_PATH} diff --git a/SuperBuild/CMake/External_expat.cmake b/SuperBuild/CMake/External_expat.cmake index 7de84dc037..b7e01c2f03 100644 --- a/SuperBuild/CMake/External_expat.cmake +++ b/SuperBuild/CMake/External_expat.cmake @@ -19,6 +19,7 @@ else() URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd BINARY_DIR ${EXPAT_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_fftw.cmake b/SuperBuild/CMake/External_fftw.cmake index 473c539de9..2d72828df6 100644 --- a/SuperBuild/CMake/External_fftw.cmake +++ b/SuperBuild/CMake/External_fftw.cmake @@ -31,6 +31,7 @@ else() URL_MD5 2edab8c06b24feeb3b82bbb3ebf3e7b3 SOURCE_DIR ${FFTW_SB_BUILD_FLOAT_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND ${FFTW_SB_BUILD_FLOAT_DIR}/configure --prefix=${SB_INSTALL_PREFIX} @@ -56,6 +57,7 @@ else() URL_MD5 2edab8c06b24feeb3b82bbb3ebf3e7b3 SOURCE_DIR ${FFTW_SB_BUILD_DOUBLE_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND ${FFTW_SB_BUILD_DOUBLE_DIR}/configure --prefix=${SB_INSTALL_PREFIX} diff --git a/SuperBuild/CMake/External_fltk.cmake b/SuperBuild/CMake/External_fltk.cmake index 0d6fa9c845..06e578a974 100644 --- a/SuperBuild/CMake/External_fltk.cmake +++ b/SuperBuild/CMake/External_fltk.cmake @@ -48,6 +48,7 @@ else() URL_MD5 9ccdb0d19dc104b87179bd9fd10822e3 BINARY_DIR ${FLTK_SB_BUILD_DIR} INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_gdal.cmake b/SuperBuild/CMake/External_gdal.cmake index 1f65cb43c4..e015f3b8e6 100644 --- a/SuperBuild/CMake/External_gdal.cmake +++ b/SuperBuild/CMake/External_gdal.cmake @@ -53,6 +53,7 @@ else() URL_MD5 9fdf0f2371a3e9863d83e69951c71ec4 BINARY_DIR ${GDAL_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} UPDATE_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR} PATCH_COMMAND ${CMAKE_COMMAND} -E touch ${GDAL_SB_SRC}/config.rpath @@ -87,6 +88,7 @@ else() SOURCE_DIR ${GDAL_SB_SRC} BINARY_DIR ${GDAL_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GDAL_SB_SRC} ${GDAL_SB_BUILD_DIR} CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/${proj}/ogrsqlitevirtualogr.cpp diff --git a/SuperBuild/CMake/External_geos.cmake b/SuperBuild/CMake/External_geos.cmake index a174077ce3..1a45504cc8 100644 --- a/SuperBuild/CMake/External_geos.cmake +++ b/SuperBuild/CMake/External_geos.cmake @@ -21,6 +21,7 @@ else() SOURCE_DIR ${GEOS_SB_SRC} BINARY_DIR ${GEOS_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_geotiff.cmake b/SuperBuild/CMake/External_geotiff.cmake index 8b60d7f9e8..f4e6775313 100644 --- a/SuperBuild/CMake/External_geotiff.cmake +++ b/SuperBuild/CMake/External_geotiff.cmake @@ -49,6 +49,7 @@ else() URL_MD5 efa7b418bc00228fcda4da63557e40c2 BINARY_DIR ${GEOTIFF_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt @@ -73,6 +74,7 @@ else() URL_MD5 efa7b418bc00228fcda4da63557e40c2 BINARY_DIR ${GEOTIFF_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND # use 'env' because CTest launcher doesn't perform shell interpretation ${SB_ENV_CONFIGURE_CMD} diff --git a/SuperBuild/CMake/External_glew.cmake b/SuperBuild/CMake/External_glew.cmake index 22159984b5..9dc6d4817d 100644 --- a/SuperBuild/CMake/External_glew.cmake +++ b/SuperBuild/CMake/External_glew.cmake @@ -25,6 +25,7 @@ else() URL_MD5 13bde2ce4168c1288f8d75ef6e051b56 BINARY_DIR ${GLEW_SB_BUILD_DIR} INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${GLEW_SB_SRC}/include ${CMAKE_INSTALL_PREFIX}/include CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${GLEW_SB_SRC}/lib/${SB_GLEW_DIR}/glew32s.lib ${CMAKE_INSTALL_PREFIX}/lib BUILD_COMMAND ${CMAKE_COMMAND} -E copy ${GLEW_SB_SRC}/lib/${SB_GLEW_DIR}/glew32.lib ${CMAKE_INSTALL_PREFIX}/lib @@ -40,6 +41,7 @@ else() URL_MD5 01246c7ecd135d99be031aa63f86dca1 BINARY_DIR ${GLEW_SB_BUILD_DIR} INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} diff --git a/SuperBuild/CMake/External_glfw.cmake b/SuperBuild/CMake/External_glfw.cmake index edd42d97ff..9aa63a7ca0 100644 --- a/SuperBuild/CMake/External_glfw.cmake +++ b/SuperBuild/CMake/External_glfw.cmake @@ -20,6 +20,7 @@ else() URL_MD5 c4f6901c88ad0795f7c5da6b5599202f BINARY_DIR ${GLFW_SB_BUILD_DIR} INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON diff --git a/SuperBuild/CMake/External_glut.cmake b/SuperBuild/CMake/External_glut.cmake index 914647d957..b90f0aa48b 100644 --- a/SuperBuild/CMake/External_glut.cmake +++ b/SuperBuild/CMake/External_glut.cmake @@ -20,6 +20,7 @@ else() URL_MD5 918ffbddcffbac83c218bc52355b6d5a BINARY_DIR ${GLUT_SB_BUILD_DIR} INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt ${GLUT_SB_SRC} CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_ice.cmake b/SuperBuild/CMake/External_ice.cmake index 3300f71660..5b58bdd83f 100644 --- a/SuperBuild/CMake/External_ice.cmake +++ b/SuperBuild/CMake/External_ice.cmake @@ -70,6 +70,7 @@ ExternalProject_Add(${proj} HG_TAG tip BINARY_DIR ${ICE_SB_BUILD_DIR} INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX} diff --git a/SuperBuild/CMake/External_itk.cmake b/SuperBuild/CMake/External_itk.cmake index 6fe971c8ea..8db695969c 100644 --- a/SuperBuild/CMake/External_itk.cmake +++ b/SuperBuild/CMake/External_itk.cmake @@ -144,6 +144,7 @@ else() SOURCE_DIR ${ITK_SB_SRC} BINARY_DIR ${ITK_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_jpeg.cmake b/SuperBuild/CMake/External_jpeg.cmake index 11223239a5..af206637fd 100644 --- a/SuperBuild/CMake/External_jpeg.cmake +++ b/SuperBuild/CMake/External_jpeg.cmake @@ -22,6 +22,7 @@ else() SOURCE_DIR ${JPEG_SB_SRC} BINARY_DIR ${JPEG_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt ${JPEG_SB_SRC} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} @@ -45,6 +46,7 @@ else() URL_MD5 3353992aecaee1805ef4109aadd433e7 BINARY_DIR ${JPEG_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND ${JPEG_SB_BUILD_DIR}/configure --prefix=${SB_INSTALL_PREFIX} diff --git a/SuperBuild/CMake/External_libkml.cmake b/SuperBuild/CMake/External_libkml.cmake index d90c4a1508..eef36df818 100644 --- a/SuperBuild/CMake/External_libkml.cmake +++ b/SuperBuild/CMake/External_libkml.cmake @@ -30,6 +30,7 @@ else() URL_MD5 211ed5fdf2dd45aeb9c0abc8e1fe42be BINARY_DIR ${LIBKML_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/patches/${proj} ${LIBKML_SB_SRC} CMAKE_CACHE_ARGS diff --git a/SuperBuild/CMake/External_monteverdi.cmake b/SuperBuild/CMake/External_monteverdi.cmake index 9327f46a83..fd9443f8eb 100644 --- a/SuperBuild/CMake/External_monteverdi.cmake +++ b/SuperBuild/CMake/External_monteverdi.cmake @@ -22,6 +22,7 @@ ExternalProject_Add(${proj} HG_TAG tip BINARY_DIR ${MVD_SB_BUILD_DIR} INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_monteverdi2.cmake b/SuperBuild/CMake/External_monteverdi2.cmake index de9759d212..6438ed6b37 100644 --- a/SuperBuild/CMake/External_monteverdi2.cmake +++ b/SuperBuild/CMake/External_monteverdi2.cmake @@ -40,6 +40,7 @@ ExternalProject_Add(${proj} HG_TAG tip BINARY_DIR ${MVD2_SB_BUILD_DIR} INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_muparser.cmake b/SuperBuild/CMake/External_muparser.cmake index be96ca5085..4d5bb32095 100644 --- a/SuperBuild/CMake/External_muparser.cmake +++ b/SuperBuild/CMake/External_muparser.cmake @@ -19,6 +19,7 @@ else() URL_MD5 9de40ec1dab5bd2787ee344fce5846ad BINARY_DIR ${MUPARSER_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_muparserx.cmake b/SuperBuild/CMake/External_muparserx.cmake index ac968db159..dd422353ba 100644 --- a/SuperBuild/CMake/External_muparserx.cmake +++ b/SuperBuild/CMake/External_muparserx.cmake @@ -28,6 +28,7 @@ else() #SVN_REVISION -r 291 BINARY_DIR ${MUPARSERX_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_opencv.cmake b/SuperBuild/CMake/External_opencv.cmake index 7601de7064..9f23d2ed36 100644 --- a/SuperBuild/CMake/External_opencv.cmake +++ b/SuperBuild/CMake/External_opencv.cmake @@ -32,6 +32,7 @@ else() URL_MD5 ec63952d3a3dff965d5fdde765926821 BINARY_DIR ${OPENCV_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_openjpeg.cmake b/SuperBuild/CMake/External_openjpeg.cmake index 69ebc569dc..073292b7cd 100644 --- a/SuperBuild/CMake/External_openjpeg.cmake +++ b/SuperBuild/CMake/External_openjpeg.cmake @@ -35,6 +35,7 @@ else() URL_MD5 d9be274bddc0f47f268e484bdcaaa6c5 BINARY_DIR ${OPENJPEG_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_openthreads.cmake b/SuperBuild/CMake/External_openthreads.cmake index 138710bcd7..0141b8838b 100644 --- a/SuperBuild/CMake/External_openthreads.cmake +++ b/SuperBuild/CMake/External_openthreads.cmake @@ -27,6 +27,7 @@ else() SOURCE_DIR ${OPENTHREADS_SB_SRC} BINARY_DIR ${OPENTHREADS_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release @@ -44,6 +45,7 @@ else() SOURCE_DIR ${OPENTHREADS_SB_SRC} BINARY_DIR ${OPENTHREADS_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_ossim.cmake b/SuperBuild/CMake/External_ossim.cmake index 80a099cfcd..8ee78decfb 100644 --- a/SuperBuild/CMake/External_ossim.cmake +++ b/SuperBuild/CMake/External_ossim.cmake @@ -65,6 +65,7 @@ else() SVN_REVISION -r 23092 BINARY_DIR ${OSSIM_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DOSSIM_VERSION:STRING=1.8.18-1 -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} @@ -95,6 +96,7 @@ else() URL_MD5 1bb7247fa490eb4a6e57b3c2e129d587 BINARY_DIR ${OSSIM_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DOSSIM_VERSION:STRING=1.8.18-1 -DProject_WC_REVISION:STRING=23092 diff --git a/SuperBuild/CMake/External_otb.cmake b/SuperBuild/CMake/External_otb.cmake index 3e2475de6a..9fe7b6c1a9 100644 --- a/SuperBuild/CMake/External_otb.cmake +++ b/SuperBuild/CMake/External_otb.cmake @@ -148,6 +148,7 @@ ExternalProject_Add(${proj} SOURCE_DIR ${OTB_SB_SRC} BINARY_DIR ${OTB_SB_BUILD_DIR} INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${CMAKE_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_pcre.cmake b/SuperBuild/CMake/External_pcre.cmake index b81661e42d..03bae6e9d4 100644 --- a/SuperBuild/CMake/External_pcre.cmake +++ b/SuperBuild/CMake/External_pcre.cmake @@ -23,6 +23,7 @@ else() URL_MD5 ff7b4bb14e355f04885cf18ff4125c98 BINARY_DIR ${PCRE_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND ${PCRE_SB_BUILD_DIR}/configure --prefix=${SB_INSTALL_PREFIX} diff --git a/SuperBuild/CMake/External_png.cmake b/SuperBuild/CMake/External_png.cmake index 2cbc83ff50..d5b50b624c 100644 --- a/SuperBuild/CMake/External_png.cmake +++ b/SuperBuild/CMake/External_png.cmake @@ -28,6 +28,7 @@ else() URL_MD5 c90c9587c9a5c735327fb3f6900f6b03 BINARY_DIR ${PNG_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} CMAKE_CACHE_ARGS -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_proj.cmake b/SuperBuild/CMake/External_proj.cmake index ce43246545..8cd7ec1795 100644 --- a/SuperBuild/CMake/External_proj.cmake +++ b/SuperBuild/CMake/External_proj.cmake @@ -23,6 +23,7 @@ else() SOURCE_DIR ${PROJ_SB_SRC} BINARY_DIR ${PROJ_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND "" BUILD_COMMAND nmake /f ${PROJ_SB_SRC}/makefile.vc INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt @@ -35,6 +36,7 @@ else() SOURCE_DIR ${proj}/_install BINARY_DIR ${PROJ_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release @@ -56,6 +58,7 @@ else() URL_MD5 d815838c92a29179298c126effbb1537 BINARY_DIR ${PROJ_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND # use 'env' because CTest launcher doesn't perform shell interpretation ${SB_ENV_CONFIGURE_CMD} diff --git a/SuperBuild/CMake/External_qt4.cmake b/SuperBuild/CMake/External_qt4.cmake index 87d7be392f..cfcdc0fd71 100644 --- a/SuperBuild/CMake/External_qt4.cmake +++ b/SuperBuild/CMake/External_qt4.cmake @@ -41,6 +41,7 @@ else() URL_MD5 2edbe4d6c2eff33ef91732602f3518eb BINARY_DIR ${QT4_SB_SRC} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND configure_qt4.bat PATCH_COMMAND ${CMAKE_COMMAND} -E copy @@ -55,6 +56,7 @@ else() URL_MD5 2edbe4d6c2eff33ef91732602f3518eb BINARY_DIR ${QT4_SB_SRC} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND configure -prefix ${CMAKE_WIN_INSTALL_PREFIX} -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-webkit -qt-sql-sqlite -plugin-sql-sqlite -no-nis -no-qt3support -system-zlib -system-libpng -system-libtiff -system-libjpeg -system-sqlite -L ${CMAKE_WIN_INSTALL_PREFIX}\\lib -I ${CMAKE_WIN_INSTALL_PREFIX}\\include DEPENDS ${${proj}_DEPENDENCIES} diff --git a/SuperBuild/CMake/External_qwt.cmake b/SuperBuild/CMake/External_qwt.cmake index 226b209058..5b8b8db4fd 100644 --- a/SuperBuild/CMake/External_qwt.cmake +++ b/SuperBuild/CMake/External_qwt.cmake @@ -42,6 +42,7 @@ else() URL_MD5 310a1c8ab831f4b2219505dcb7691cf1 BINARY_DIR ${QWT_SB_SRC} INSTALL_DIR ${CMAKE_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/qwtconfig.pri ${QWT_SB_SRC} CONFIGURE_COMMAND qmake ${QWT_SB_SRC}/qwt.pro diff --git a/SuperBuild/CMake/External_sqlite.cmake b/SuperBuild/CMake/External_sqlite.cmake index ad46518a9a..adc7b0458a 100644 --- a/SuperBuild/CMake/External_sqlite.cmake +++ b/SuperBuild/CMake/External_sqlite.cmake @@ -21,6 +21,7 @@ else() URL_MD5 0f847048745ddbdf0c441c82d096fbb4 BINARY_DIR ${SQLITE_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND ${SQLITE_SB_BUILD_DIR}/configure --prefix=${SB_INSTALL_PREFIX} --enable-static=no @@ -43,6 +44,7 @@ else() SOURCE_DIR ${SQLITE_SB_SRC} BINARY_DIR ${SQLITE_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/${proj}/CMakeLists.txt ${SQLITE_SB_SRC} UPDATE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/${proj}/sqlite3_win.c ${SQLITE_SB_SRC} CMAKE_CACHE_ARGS diff --git a/SuperBuild/CMake/External_swig.cmake b/SuperBuild/CMake/External_swig.cmake index 3e81912036..ec2faec767 100644 --- a/SuperBuild/CMake/External_swig.cmake +++ b/SuperBuild/CMake/External_swig.cmake @@ -37,6 +37,7 @@ else() URL "http://sourceforge.net/projects/swig/files/swigwin/swigwin-3.0.5/swigwin-3.0.5.zip/download" URL_MD5 fd2e050f29e2a00b2348f5f7d3476490 INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" @@ -59,6 +60,7 @@ else() URL_MD5 dcb9638324461b9baba8e044fe59031d BINARY_DIR ${SWIG_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND ${SWIG_SB_BUILD_DIR}/configure --prefix=${SB_INSTALL_PREFIX} diff --git a/SuperBuild/CMake/External_tiff.cmake b/SuperBuild/CMake/External_tiff.cmake index 6c7040a240..42da7d6a91 100644 --- a/SuperBuild/CMake/External_tiff.cmake +++ b/SuperBuild/CMake/External_tiff.cmake @@ -42,6 +42,7 @@ else() SOURCE_DIR ${TIFF_SB_SRC} BINARY_DIR ${TIFF_SB_SRC} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DEPENDS ${${proj}_DEPENDENCIES} PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/nmake_libtiff_extra.opt ${TIFF_SB_SRC}/nmake.opt CONFIGURE_COMMAND "" @@ -56,6 +57,7 @@ else() SOURCE_DIR ${proj}/_install BINARY_DIR ${TIFF_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release @@ -71,6 +73,7 @@ else() URL_MD5 051c1068e6a0627f461948c365290410 BINARY_DIR ${TIFF_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CONFIGURE_COMMAND # use 'env' because CTest launcher doesn't perform shell interpretation ${SB_ENV_CONFIGURE_CMD} diff --git a/SuperBuild/CMake/External_tinyxml.cmake b/SuperBuild/CMake/External_tinyxml.cmake index c9ec186205..83fe1968b3 100644 --- a/SuperBuild/CMake/External_tinyxml.cmake +++ b/SuperBuild/CMake/External_tinyxml.cmake @@ -19,6 +19,7 @@ else() URL_MD5 c1b864c96804a10526540c664ade67f0 BINARY_DIR ${TINYXML_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release diff --git a/SuperBuild/CMake/External_zlib.cmake b/SuperBuild/CMake/External_zlib.cmake index d67f96b967..391e6d379b 100644 --- a/SuperBuild/CMake/External_zlib.cmake +++ b/SuperBuild/CMake/External_zlib.cmake @@ -25,6 +25,7 @@ else() URL_MD5 44d667c142d7cda120332623eab69f40 BINARY_DIR ${ZLIB_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} + DOWNLOAD_DIR ${DOWNLOAD_LOCATION} CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE:STRING=Release -- GitLab