Commit fe62ecff authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'tarball-conversions'

2998f390 gdal: fix LT_OBJDIR warnings
2c5fe8bc gitattributes: sync patch attributes with common-superbuild
d722dbc2 versions: use tarballs rather than git repos
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard's avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !188
parents 3b465700 2998f390
*.patch whitespace=-blank-at-eol,-space-before-tab -text
*.patch whitespace=-blank-at-eol -text
......@@ -11,6 +11,9 @@ superbuild_add_project(gdal
-DGDAL_ENABLE_FRMT_MEM:BOOL=ON
-DOGR_ENABLE_MEM:BOOL=ON)
superbuild_apply_patch(gdal lt_objdir-warning
"Fix warning about LT_OBJDIR redefinition")
if (APPLE)
set(gdal_lib <INSTALL_DIR>/lib/libgdal111.dylib)
elseif (WIN32)
......
diff --git a/cmake/cpl_config.h.cmake b/cmake/cpl_config.h.cmake
index 58feff6..67eaeed 100644
--- a/cmake/cpl_config.h.cmake
+++ b/cmake/cpl_config.h.cmake
@@ -140,10 +140,6 @@
/* For .cpp files, define as const if the declaration of iconv() needs const. */
//#undef ICONV_CPP_CONST
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#define LT_OBJDIR "@LT_OBJDIR@"
-
/* Define for Mac OSX Framework build */
#cmakedefine MACOSX_FRAMEWORK
......@@ -14,8 +14,9 @@ superbuild_set_revision(paraview
GIT_TAG "${paraview_revision}")
superbuild_set_revision(shiboken
GIT_REPOSITORY "https://github.com/OpenGeoscience/shiboken.git"
GIT_TAG origin/smtk-head)
# https://github.com/OpenGeoscience/shiboken.git
URL "http://www.paraview.org/files/dependencies/shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21.tar.bz2"
URL_MD5 53e71b32964b5daf38b45e1679623e48)
superbuild_set_external_source(smtk
"https://gitlab.kitware.com/cmb/smtk.git" "origin/master"
......@@ -32,21 +33,27 @@ superbuild_set_revision(cmbworkflows
GIT_TAG origin/master)
superbuild_set_revision(vxl
URL "https://github.com/judajake/vxl/archive/44433e4bd8ca3eabe4e5441444bf2a050d689d45.tar.gz"
URL_MD5 6ca7a87bebb12338a45277b921af4277)
# https://github.com/judajake/vxl.git
URL "http://www.paraview.org/files/dependencies/vxl-44433e4bd8ca3eabe4e5441444bf2a050d689d45.tar.bz2"
URL_MD5 dfff6d1958334cbbadb4edbf8c3f4cb6)
superbuild_set_revision(opencv
GIT_REPOSITORY "https://github.com/opencv/opencv.git"
GIT_TAG 74e997f15b20600895896e1a837a0bb3cbf7f07b ) #Master at Aug 11 2016
# https://github.com/opencv/opencv.git
# master as of Aug 11 2016
URL "http://www.paraview.org/files/dependencies/opencv-74e997f15b20600895896e1a837a0bb3cbf7f07b.tar.bz2"
URL_MD5 b33767f505bb0e67ffb25d33f5301fa1)
superbuild_set_revision(opencvcontrib
GIT_REPOSITORY "https://github.com/opencv/opencv_contrib.git"
GIT_TAG 73459049a323af2c88e89037b45fadb7085020fb ) #Master at Aug 11 2016
# https://github.com/opencv/opencv_contrib.git
# master as of Aug 11 2016
URL "http://www.paraview.org/files/dependencies/opencv-contrib-73459049a323af2c88e89037b45fadb7085020fb.tar.bz2"
URL_MD5 ce88b2b192bc4018ef39cbafcc8d77b3)
# Use the tweaked cmake build of zeromq
superbuild_set_revision(zeromq
GIT_REPOSITORY "https://github.com/robertmaynard/zeromq4-x.git"
GIT_TAG origin/master)
# https://github.com/robertmaynard/zeromq4-x.git
URL "http://www.paraview.org/files/dependencies/zeromq4-639f18bf0db988a7f000afa2e27c49ae21625c4e.tar.bz2"
URL_MD5 ed62ea313d222686b8790ebe0b1de444)
# Use remus from Fri Jul 29 15:25:33 2016 -0400
superbuild_set_revision(remus
......@@ -58,16 +65,19 @@ superbuild_set_revision(kml
URL_MD5 261b39166b18c2691212ce3495be4e9c)
superbuild_set_revision(gdal
GIT_REPOSITORY "https://github.com/judajake/gdal-svn.git"
GIT_TAG origin/gdal-1.11-cmb)
# https://github.com/judajake/gdal-svn.git
URL "http://www.paraview.org/files/dependencies/gdal-95abc689c1e356b3fcb0a2b71f53f4f23917b56c.tar.bz2"
URL_MD5 74f67d309e276f742ae52dcc0f072e18)
superbuild_set_revision(moab
GIT_REPOSITORY "https://bitbucket.org/mathstuf/moab.git"
GIT_TAG origin/next)
# https://bitbucket.org/mathstuf/moab.git
URL "http://www.paraview.org/files/dependencies/moab-ca9ab9e13928f5fbba884f9167111d79cc84781e.tar.bz2"
URL_MD5 f593bba902f8db16aeb83f01a01f2102)
superbuild_set_revision(triangle
GIT_REPOSITORY "https://github.com/robertmaynard/triangle.git"
GIT_TAG origin/master)
# https://github.com/robertmaynard/triangle.git
URL "http://www.paraview.org/files/dependencies/triangle-4c20820448cdfa27f968cfd7cb33ea5b9426ad91.tar.bz2"
URL_MD5 9a016bc90f1cdff441c75ceb53741b11)
superbuild_set_revision(pythonsix
URL "https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz"
......@@ -94,13 +104,16 @@ superbuild_set_revision(pythongirderclient
URL_MD5 4cd5e0cab41337a41f45453d25193dcf)
superbuild_set_revision(ftgl
GIT_REPOSITORY "https://github.com/ulrichard/ftgl.git"
GIT_TAG dfd7c9f0dee7f0059d5784f3a71118ae5c0afff4)
# https://github.com/ulrichard/ftgl.git
URL "http://www.paraview.org/files/dependencies/ftgl-dfd7c9f0dee7f0059d5784f3a71118ae5c0afff4.tar.bz2"
URL_MD5 16e54c7391f449c942f3f12378db238f)
superbuild_set_revision(oce
GIT_REPOSITORY "https://github.com/mathstuf/oce.git"
GIT_TAG origin/next-x11)
# https://github.com/mathstuf/oce.git
URL "http://www.paraview.org/files/dependencies/oce-9b4646a11c7d9be65a6c2df0ade6604cc91b1fa4.tar.bz2"
URL_MD5 adea5bd5a7510c7da58755ca7d964319)
superbuild_set_revision(cgm
GIT_REPOSITORY "https://bitbucket.org/mathstuf/cgm.git"
GIT_TAG origin/update-cmakelists)
# https://bitbucket.org/mathstuf/cgm.git
URL "http://www.paraview.org/files/dependencies/cgm-fd563100bc4d194721d5a2be8775a613738326f6.tar.bz2"
URL_MD5 f875003c15ef43f3bfb4da8ded95d73c)
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