mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 05:06:36 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vtk] Add find dependency pugixml in cmake config file (#10379)

Browse Source 
* [vtk] Add find dependency pugixml in cmake config file

* [vtk] Re-generate patch

* re-trigger ci test
This commit is contained in:
Jack·Boos·Yu 2020-03-28 11:23:18 +08:00 committed by GitHub
parent aeffa625e5
commit b5deb0c8cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/vtk/CONTROL
View File

@ -1,5 +1,5 @@
Source: vtk
Version: 8.2.0-11
Version: 8.2.0-12
Description: Software system for 3D computer graphics, image processing, and visualization
Homepage: https://github.com/Kitware/VTK
Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c

42
ports/vtk/fix-pugixml-link.patch
View File

@ -1,14 +1,28 @@
diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt
index ce979ba..322e2de 100644
--- a/IO/CityGML/CMakeLists.txt
+++ b/IO/CityGML/CMakeLists.txt
@@ -4,8 +4,5 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
# pugixml does not set _INCLUDE_DIRS or _LIBRARIES
if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS)
find_package(pugixml REQUIRED)
- get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES)
- get_target_property(pugixml_LIBRARIES pugixml LOCATION)
- include_directories(${pugixml_INCLUDE_DIRS})
- vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
+ vtk_module_link_libraries(vtkIOCityGML LINK_PUBLIC pugixml)
endif()
diff --git a/CMake/VTKConfig.cmake.in b/CMake/VTKConfig.cmake.in
index d28e0cc..7ed48bc 100644
--- a/CMake/VTKConfig.cmake.in
+++ b/CMake/VTKConfig.cmake.in
@@ -88,6 +88,9 @@ if(VTK_HAS_VTKM AND NOT TARGET vtkm_cont)
)
endif()
+# Find dependencies
+include(CMakeFindDependencyMacro)
+find_dependency(pugixml REQUIRED)
#-----------------------------------------------------------------------------
# Load requested modules.
diff --git a/IO/CityGML/CMakeLists.txt b/IO/CityGML/CMakeLists.txt
index ce979ba..744c6f1 100644
--- a/IO/CityGML/CMakeLists.txt
+++ b/IO/CityGML/CMakeLists.txt
@@ -4,8 +4,5 @@ vtk_module_library(vtkIOCityGML ${Module_SRCS})
# pugixml does not set _INCLUDE_DIRS or _LIBRARIES
if(VTK_USE_SYSTEM_PUGIXML AND NOT pugixml_INCLUDE_DIRS)
find_package(pugixml REQUIRED)
- get_target_property(pugixml_INCLUDE_DIRS pugixml INTERFACE_INCLUDE_DIRECTORIES)
- get_target_property(pugixml_LIBRARIES pugixml LOCATION)
- include_directories(${pugixml_INCLUDE_DIRS})
- vtk_module_link_libraries(vtkIOCityGML LINK_PRIVATE ${pugixml_LIBRARIES})
+ vtk_module_link_libraries(vtkIOCityGML LINK_PUBLIC pugixml)
endif()

4
ports/vtk/portfile.cmake
View File

@ -250,8 +250,8 @@ endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk)
# =============================================================================
# Handle copyright
file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/vtk)