Merge topic 'proj-mingw-fix'

b4fcea7e Merge branch 'upstream-libproj' into proj-mingw-fix
9cca016b libproj 2023-06-19 (379f3407)
59249c05 libproj: fix `STRICT` conflict for MinGW as well

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Mathieu Westphal (Kitware) <mathieu.westphal@kitware.com>
Merge-request: !10286

ThirdParty/libproj/update.sh

@@ -8,7 +8,7 @@ readonly name="libproj"
 readonly ownership="Proj Upstream <kwrobot@kitware.com>"
 readonly subtree="ThirdParty/$name/vtk$name"
 readonly repo="https://gitlab.kitware.com/third-party/proj.git"
-readonly tag="for/vtk-20230504-8.1.0"
+readonly tag="for/vtk-20230619-8.1.0"
 readonly paths="
 .gitattributes
 ChangeLog

ThirdParty/libproj/vtklibproj/include/proj/util.hpp

@@ -36,17 +36,17 @@
 #include "vtk_libproj_mangle.h"
 #include "vtklibproj_export.h"
 
+// windows.h can confict with Criterion::STRICT
+#ifdef STRICT
+#undef STRICT
+#endif
+
 #include <exception>
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
-// Prevent interference with enum in this file.
-#ifdef _MSC_VER
-#undef STRICT
-#endif
-
 #ifndef NS_PROJ
 /** osgeo namespace */
 namespace osgeo {