Commit 1033d509 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic 'vs2015-fixes'

d4a26514 tbb: bring in tbb fixes for vs2015.
9f368aaf

 vs2015: fixes to silo build.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Shawn Waldon's avatarShawn Waldon <shawn.waldon@kitware.com>
Merge-request: !449
parents 3a4db77b d4a26514
Pipeline #99081 passed with stage
in 0 seconds
diff --git a/src/silo/silo_win32_compatibility.h b/src/silo/silo_win32_compatibility.h
index 28bf300..df1d214 100644
--- a/src/silo/silo_win32_compatibility.h
+++ b/src/silo/silo_win32_compatibility.h
@@ -12,7 +12,9 @@
#define pclose _pclose
#define popen _popen
#define read _read
-#define snprintf _snprintf
+#if _MSC_VER<1900 /* VS2015 onwards, snprintf is supported*/
+# define snprintf _snprintf
+#endif
#define stat _stat
#define write _write
......@@ -54,6 +54,8 @@ superbuild_apply_patch(silo no-perl
"Remove the need for Perl during the build")
superbuild_apply_patch(silo hdf5-deplibs
"Link to HDF5 properly")
superbuild_apply_patch(silo snprintf
"Remove snprint redefinition for VS201 and newer")
superbuild_add_extra_cmake_args(
-DSILO_INCLUDE_DIR:PATH=<INSTALL_DIR>/include
......
Subproject commit 51ec8e0ef43c5e540fa7ade4fe5f47b55abecae5
Subproject commit cf2b7e6c44d92f56b60929c54461cb7a970c5b0c
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