Skip to content

Commit 3206cc6

Browse files
cquammenkwrobot
authored andcommitted
Merge topic 'update-libxml2'
6ebb628 Merge branch 'upstream-libxml2' into update-libxml2 4cc84e7 libxml2 2019-04-01 (a41ab7b3) a7f2269 libxml2: Modify update.sh for new update Acked-by: Kitware Robot <[email protected]> Acked-by: Ben Boeckel <[email protected]> Merge-request: !5356
2 parents cae4eb1 + 6ebb628 commit 3206cc6

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

ThirdParty/libxml2/update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ readonly name="libxml2"
88
readonly ownership="libxml2 Upstream <[email protected]>"
99
readonly subtree="ThirdParty/$name/vtk$name"
1010
readonly repo="https://gitlab.kitware.com/third-party/libxml2.git"
11-
readonly tag="for/vtk-20181015-2.9.8"
11+
readonly tag="for/vtk-20190401-2.9.8"
1212
readonly paths="
1313
include/libxml/*.h
1414
include/libxml/xmlversion.h.in

ThirdParty/libxml2/vtklibxml2/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ SET(LIBXML_VERSION_NUMBER 20627)
44
SET(LIBXML_VERSION_EXTRA "")
55
SET(MODULE_EXTENSION ${CMAKE_SHARED_MODULE_SUFFIX})
66

7+
# Use new behavior of linking against libraries in the CMAKE_REQUIRED_LIBRARIES
8+
# variable in the CHECK_INCLUDE_FILE macro
9+
IF (POLICY CMP0075)
10+
CMAKE_POLICY(SET CMP0075 NEW)
11+
ENDIF()
12+
713
INCLUDE(CheckLibraryExists)
814
INCLUDE(CheckIncludeFile)
915
INCLUDE(CheckIncludeFiles)

0 commit comments

Comments
 (0)