zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Paraview package: update freetype find patch for shared libs (#40085)

Browse Source 
VTK's (and therefore Paraview's) FindFreetype module required patching to
handle static import libraries from Freetype. However it did not cover
shared libraries. This adds support for importing shared freetype into the VTK build
This commit is contained in:
John W. Parent 2023-09-26 13:41:24 -04:00 committed by GitHub
parent 5c25437c9f
commit 115e448bd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/paraview/FindFreetype.cmake.patch
View File

@ -1,8 +1,9 @@
Submodule VTK contains modified content
diff --git a/VTK/CMake/FindFreetype.cmake b/VTK/CMake/FindFreetype.cmake diff --git a/VTK/CMake/FindFreetype.cmake b/VTK/CMake/FindFreetype.cmake
index b4532735c2..f06d32327e 100644 index b4532735c2..51671d4c3c 100644
--- a/VTK/CMake/FindFreetype.cmake --- a/VTK/CMake/FindFreetype.cmake
+++ b/VTK/CMake/FindFreetype.cmake +++ b/VTK/CMake/FindFreetype.cmake
@@ -63,6 +63,30 @@ directory of a Freetype installation. @@ -63,6 +63,32 @@ directory of a Freetype installation.
# I'm going to attempt to cut out the middleman and hope # I'm going to attempt to cut out the middleman and hope
# everything still works. # everything still works.
@ -14,6 +15,8 @@ index b4532735c2..f06d32327e 100644
+ get_target_property(freetype_location freetype LOCATION) + get_target_property(freetype_location freetype LOCATION)
+ if (freetype_library_type STREQUAL STATIC_LIBRARY) + if (freetype_library_type STREQUAL STATIC_LIBRARY)
+ set(freetype_library_type STATIC) + set(freetype_library_type STATIC)
+ elseif (freetype_library_type STREQUAL SHARED_LIBRARY)
+ set(freetype_library_type SHARED)
+ endif() + endif()
+ get_target_property(freetype_interface_include_directories freetype INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(freetype_interface_include_directories freetype INTERFACE_INCLUDE_DIRECTORIES)
+ get_target_property(freetype_interface_link_libraries freetype INTERFACE_LINK_LIBRARIES) + get_target_property(freetype_interface_link_libraries freetype INTERFACE_LINK_LIBRARIES)