Commit 185cd00a authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'expat-2.4.8-fix-cache-var' into paraview/release

e571dc55 Merge branch 'expat-2.4.8-release' into expat-2.4.8-fix-cache-var
08d0f916 Merge branch 'upstream-expat' into expat-2.4.8-fix-cache-var
48eef893 expat 2022-09-21 (e0cbe708)
b75167fd expat: update to avoid unnecessary cache variables
dd2bc26b Merge branch 'upstream-expat' into expat-2.4.8
ca4219f0 expat 2022-09-21 (e0cbe708)
f0200430 expat: update to 2.4.8
fdd081a5

 Merge topic 'cgns_version_detection' into release

Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: buildbot's avatarbuildbot <buildbot@kitware.com>
Acked-by: Jaswant Panchumarti's avatarJaswant Panchumarti <jaswant.panchumarti@kitware.com>
Merge-request: !9561
parents bd1b6816 e571dc55
......@@ -8,7 +8,7 @@ readonly name="expat"
readonly ownership="Expat Upstream <kwrobot@kitware.com>"
readonly subtree="ThirdParty/$name/vtk$name"
readonly repo="https://gitlab.kitware.com/third-party/expat.git"
readonly tag="for/vtk-20220829-2.4.8"
readonly tag="for/vtk-20220921-2.4.8"
readonly paths="
expat/.gitattributes
expat/CMakeLists.txt
......
......@@ -400,6 +400,7 @@ if(MSVC AND NOT EXPAT_SHARED_LIBS)
endif()
endif()
if (FALSE) # XXX(kitware): Settings handled by VTK.
foreach(postfix_var
CMAKE_${_EXPAT_BUILD_TYPE_UPPER}_POSTFIX
CMAKE_DEBUG_POSTFIX
......@@ -415,6 +416,7 @@ foreach(postfix_var
set(${postfix_var} "${_POSTFIX_WIDE}${_POSTFIX_DEBUG}${_POSTFIX_CRT}" CACHE STRING "Library filename postfix, e.g. libexpat<postfix=[w][d][MD|MT]>.lib")
endforeach()
endif ()
#
# C library
......
Supports Markdown
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