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

Merge topic 'VS2015-update'

cd3ed66d Update superbuild for VS2015
31ffbc3f shiboken: add flag to ignore deprecation warning
aaa6e876 patch files: add more attributes for kwrobot
8781b276 Update remus for VS2015
ac565ceb Update zeromq and gdal for VS2015
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !218
parents 497089e0 cd3ed66d
*.patch whitespace=-blank-at-eol -text
*.patch whitespace=-blank-at-eol,-space-before-tab -text -crlf
diff -NrU5 shiboken/CMakeLists.txt shiboken-patched/CMakeLists.txt
--- shiboken/CMakeLists.txt 2016-06-02 14:57:59.000000000 -0400
+++ shiboken-patched/CMakeLists.txt 2016-12-09 10:19:29.000000000 -0500
@@ -46,11 +46,11 @@
endif()
file(TO_CMAKE_PATH "${PYTHON_SITE_PACKAGES}" PYTHON_SITE_PACKAGES)
endif()
if(MSVC)
- set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS")
+ set(CMAKE_CXX_FLAGS "/Zc:wchar_t- /GR /EHsc /DWIN32 /D_WINDOWS /D_SCL_SECURE_NO_WARNINGS /D_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS")
else()
if(CMAKE_HOST_UNIX AND NOT CYGWIN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -Wno-strict-aliasing")
endif()
set(CMAKE_CXX_FLAGS_DEBUG "-g")
include("${CMAKE_CURRENT_LIST_DIR}/../shiboken.cmake")
superbuild_apply_patch(shiboken VC2015
"Add flag to ignore deprecation warnings for VC2015.")
\ No newline at end of file
Subproject commit e0388398f6edd0f4fa1e2bf680beaeedbeaf255e
Subproject commit f64e51c25c8078c41a4ba0df8acf5781efe16599
......@@ -46,18 +46,18 @@ superbuild_set_revision(opencv
# Use the tweaked cmake build of zeromq
superbuild_set_revision(zeromq
# https://github.com/robertmaynard/zeromq4-x.git
URL "http://www.paraview.org/files/dependencies/zeromq4-8f612f55e29c75c8d3d0790626a1e3de0186cd1d.tar.bz2"
URL_MD5 7c1a954aa05a882b5946dfe4b4b42219)
URL "http://www.computationalmodelbuilder.org/files/dependencies/zeromq4-6d787cf69da6c69550e85a45be1bee1eb0e1c415.tar.bz2"
URL_MD5 26790786e01a1732a8acf723b99712ba)
# Use remus from Fri Jul 29 15:25:33 2016 -0400
superbuild_set_revision(remus
GIT_REPOSITORY "https://gitlab.kitware.com/cmb/remus.git"
GIT_TAG 378c70d5f7ebd3323e724f60b4dbc2ba2dfc3011)
GIT_TAG 1148df5bb86a2dc9bd61d19edbe6f77c582a5641)
superbuild_set_revision(gdal
# https://github.com/judajake/gdal-svn.git
URL "http://www.paraview.org/files/dependencies/gdal-95abc689c1e356b3fcb0a2b71f53f4f23917b56c.tar.bz2"
URL_MD5 74f67d309e276f742ae52dcc0f072e18)
URL "http://www.computationalmodelbuilder.org/files/dependencies/gdal-bdaf4b0d16a0803548e68ee8617b796782208743.tar.bz2"
URL_MD5 31d9d9da51200b8be950cd69f327d308)
superbuild_set_revision(moab
# https://bitbucket.org/mathstuf/moab.git
......
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