Merge pull request #1409 from johnhaddon/deps8.0Fixes

johnhaddon · web-flow · commit 4b66da91fedf · 2024-02-15T09:53:38.000Z
Build : Fix errors from Dependencies 8.x
diff --git a/Changes b/Changes
@@ -15,7 +15,7 @@ Build
 -----
 
 - SConstruct : Support detection of OpenEXR versions with a patch version containing multiple digits.
-
+- Fixed building with MSVC and Gaffer Dependencies 8.x.
 
 10.5.6.0 (relative to 10.5.5.0)
 ========
diff --git a/SConstruct b/SConstruct
@@ -1174,7 +1174,9 @@ else:
 				# that "C4275 can be ignored if you are deriving from a type in the
 				# C++ Standard Library", which is the case
 				"/wd4275",
+				"/wd4003",  # suppress warning "not enough arguments for function-like macro invocation 'BOOST_PP_SEQ_DETAIL_IS_NOT_EMPTY'"
 				"/D_CRT_SECURE_NO_WARNINGS",  # suppress warnings about getenv and similar
+				"/DHAVE_SNPRINTF",  # Fixes error "multiple definitions of snprintf"
 			]
 		)
 

Original file line number	Diff line number	Diff line change
`@@ -1174,7 +1174,9 @@ else:`
`1174`	`1174`	`# that "C4275 can be ignored if you are deriving from a type in the`
`1175`	`1175`	`# C++ Standard Library", which is the case`
`1176`	`1176`	`"/wd4275",`
	`1177`	`+ "/wd4003", # suppress warning "not enough arguments for function-like macro invocation 'BOOST_PP_SEQ_DETAIL_IS_NOT_EMPTY'"`
`1177`	`1178`	`"/D_CRT_SECURE_NO_WARNINGS", # suppress warnings about getenv and similar`
	`1179`	`+ "/DHAVE_SNPRINTF", # Fixes error "multiple definitions of snprintf"`
`1178`	`1180`	`]`
`1179`	`1181`	`)`
`1180`	`1182`