aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-07 17:10:43 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-02-07 17:10:43 -0800
commit116914e110e06183eaa8626accf1403637b6b681 (patch)
tree00555c38233d1e510fe3ac733c0117639b372948 /scripts
parent676c861ae65569058014ac5367447464f1fb0877 (diff)
downloadvcpkg-116914e110e06183eaa8626accf1403637b6b681.tar.gz
vcpkg-116914e110e06183eaa8626accf1403637b6b681.zip
[vtk] Fix breaking change in find_package(HDF5)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/buildsystems/vcpkg.cmake3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index 9fbc24ad7..0cb311555 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -223,7 +223,8 @@ macro(find_package name)
add_library(tinyxml2 INTERFACE IMPORTED)
set_target_properties(tinyxml2 PROPERTIES INTERFACE_LINK_LIBRARIES "tinyxml2_static")
endif()
- elseif("${name}" STREQUAL "HDF5")
+ elseif("${name}" STREQUAL "HDF5" AND NOT PROJECT_NAME STREQUAL "VTK")
+ # This is a hack to make VTK work. TODO: find another way to suppress the built-in find module.
_find_package(${ARGV} CONFIG)
elseif("${name}" STREQUAL "CURL")
_find_package(${ARGV})