mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 05:49:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
f12137f89c
vcpkg/ports/vtk/fix-find-libharu.patch

37 lines
1.2 KiB
Diff
Raw Normal View History

[vcpkg baseline][libharu] update to 2.4.0-rc1 (#25569) * update to 2.4.0-rc1 * update vtk vcpkg.json file * export targets * update patch * update patch * Fix FindLibHaru in vtk * update ports/vtk/FindLibHaru.patch * update patch * fix find libharu
2022-07-14 01:30:11 +08:00
diff --git a/CMake/vtkInstallCMakePackage.cmake b/CMake/vtkInstallCMakePackage.cmake
[libharu,wt] Update libharu to 2.4.2 and Wt to 4.8.1 (#26945) * [libharu] Update to 2.4.2 I updated the patches for libharu so they apply to 2.4.2 properly. The target name changed from haru to hpdf, the haru imported library is included for backwards compatibility. I added a usage file that only mentions hpdf. I added a patch for VTK so that it compiles with libharu 2.4.x, since the type of one the HPDF_Page_SetDash arguments changed from HPDF_UINT16 to HPDF_REAL. POCO also has an optional libharu dependency when the 'pdf' feature is enabled, but at the moment the PocoPDF library doesn't seem to be built even when enabled. * [wt] Update to 4.8.1 This release fixes compatibility with libharu 2.4.x
2022-10-01 05:52:19 +08:00
index bcb20446c2..24c06ed8ad 100644
[vcpkg baseline][libharu] update to 2.4.0-rc1 (#25569) * update to 2.4.0-rc1 * update vtk vcpkg.json file * export targets * update patch * update patch * Fix FindLibHaru in vtk * update ports/vtk/FindLibHaru.patch * update patch * fix find libharu
2022-07-14 01:30:11 +08:00
--- a/CMake/vtkInstallCMakePackage.cmake
+++ b/CMake/vtkInstallCMakePackage.cmake
@@ -62,7 +62,6 @@ set(vtk_cmake_module_files
FindGLEW.cmake
FindJOGL.cmake
FindJsonCpp.cmake
- FindLibHaru.cmake
FindLibPROJ.cmake
FindLibXml2.cmake
FindLZ4.cmake
diff --git a/ThirdParty/libharu/CMakeLists.txt b/ThirdParty/libharu/CMakeLists.txt
[libharu,wt] Update libharu to 2.4.2 and Wt to 4.8.1 (#26945) * [libharu] Update to 2.4.2 I updated the patches for libharu so they apply to 2.4.2 properly. The target name changed from haru to hpdf, the haru imported library is included for backwards compatibility. I added a usage file that only mentions hpdf. I added a patch for VTK so that it compiles with libharu 2.4.x, since the type of one the HPDF_Page_SetDash arguments changed from HPDF_UINT16 to HPDF_REAL. POCO also has an optional libharu dependency when the 'pdf' feature is enabled, but at the moment the PocoPDF library doesn't seem to be built even when enabled. * [wt] Update to 4.8.1 This release fixes compatibility with libharu 2.4.x
2022-10-01 05:52:19 +08:00
index bac8dce188..44004fd9bb 100644
[vcpkg baseline][libharu] update to 2.4.0-rc1 (#25569) * update to 2.4.0-rc1 * update vtk vcpkg.json file * export targets * update patch * update patch * Fix FindLibHaru in vtk * update ports/vtk/FindLibHaru.patch * update patch * fix find libharu
2022-07-14 01:30:11 +08:00
--- a/ThirdParty/libharu/CMakeLists.txt
+++ b/ThirdParty/libharu/CMakeLists.txt
@@ -4,16 +4,15 @@ vtk_module_third_party(
VERSION "2.4.0"
STANDARD_INCLUDE_DIRS
EXTERNAL
- PACKAGE LibHaru
+ PACKAGE unofficial-libharu CONFIG_MODE
# Unreleased. Requires these PRs:
# https://github.com/libharu/libharu/pull/157
# https://github.com/libharu/libharu/pull/187
- VERSION 2.4.0
- TARGETS LibHaru::LibHaru
[libharu,wt] Update libharu to 2.4.2 and Wt to 4.8.1 (#26945) * [libharu] Update to 2.4.2 I updated the patches for libharu so they apply to 2.4.2 properly. The target name changed from haru to hpdf, the haru imported library is included for backwards compatibility. I added a usage file that only mentions hpdf. I added a patch for VTK so that it compiles with libharu 2.4.x, since the type of one the HPDF_Page_SetDash arguments changed from HPDF_UINT16 to HPDF_REAL. POCO also has an optional libharu dependency when the 'pdf' feature is enabled, but at the moment the PocoPDF library doesn't seem to be built even when enabled. * [wt] Update to 4.8.1 This release fixes compatibility with libharu 2.4.x
2022-10-01 05:52:19 +08:00
+ TARGETS unofficial::libharu::hpdf
[vcpkg baseline][libharu] update to 2.4.0-rc1 (#25569) * update to 2.4.0-rc1 * update vtk vcpkg.json file * export targets * update patch * update patch * Fix FindLibHaru in vtk * update ports/vtk/FindLibHaru.patch * update patch * fix find libharu
2022-07-14 01:30:11 +08:00
STANDARD_INCLUDE_DIRS)
include(vtkDetectLibraryType)
-vtk_detect_library_shared(vtklibharu LibHaru::LibHaru)
[libharu,wt] Update libharu to 2.4.2 and Wt to 4.8.1 (#26945) * [libharu] Update to 2.4.2 I updated the patches for libharu so they apply to 2.4.2 properly. The target name changed from haru to hpdf, the haru imported library is included for backwards compatibility. I added a usage file that only mentions hpdf. I added a patch for VTK so that it compiles with libharu 2.4.x, since the type of one the HPDF_Page_SetDash arguments changed from HPDF_UINT16 to HPDF_REAL. POCO also has an optional libharu dependency when the 'pdf' feature is enabled, but at the moment the PocoPDF library doesn't seem to be built even when enabled. * [wt] Update to 4.8.1 This release fixes compatibility with libharu 2.4.x
2022-10-01 05:52:19 +08:00
+vtk_detect_library_shared(vtklibharu unofficial::libharu::hpdf)
[vcpkg baseline][libharu] update to 2.4.0-rc1 (#25569) * update to 2.4.0-rc1 * update vtk vcpkg.json file * export targets * update patch * update patch * Fix FindLibHaru in vtk * update ports/vtk/FindLibHaru.patch * update patch * fix find libharu
2022-07-14 01:30:11 +08:00
set(HPDF_DLL 0)
if (WIN32 AND vtklibharu_is_shared)
Reference in New Issue Copy Permalink