summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn W. Parent <45471568+johnwparent@users.noreply.github.com>2023-09-26 13:41:24 -0400
committerGitHub <noreply@github.com>2023-09-26 10:41:24 -0700
commit115e448bd37dad0833da16528a1c1c45fce233c2 (patch)
tree138e9dfacae3fe6412c3f98f31a1879580315ed7
parent5c25437c9fe937fa83a2978cc980c678a3b638e7 (diff)
downloadspack-115e448bd37dad0833da16528a1c1c45fce233c2.tar.gz
spack-115e448bd37dad0833da16528a1c1c45fce233c2.tar.bz2
spack-115e448bd37dad0833da16528a1c1c45fce233c2.tar.xz
spack-115e448bd37dad0833da16528a1c1c45fce233c2.zip
Paraview package: update freetype find patch for shared libs (#40085)
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
-rw-r--r--var/spack/repos/builtin/packages/paraview/FindFreetype.cmake.patch7
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/paraview/FindFreetype.cmake.patch b/var/spack/repos/builtin/packages/paraview/FindFreetype.cmake.patch
index ebb5f7c29c..7e20b0a571 100644
--- a/var/spack/repos/builtin/packages/paraview/FindFreetype.cmake.patch
+++ b/var/spack/repos/builtin/packages/paraview/FindFreetype.cmake.patch
@@ -1,8 +1,9 @@
+Submodule VTK contains modified content
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
+++ 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
# everything still works.
@@ -14,6 +15,8 @@ index b4532735c2..f06d32327e 100644
+ get_target_property(freetype_location freetype LOCATION)
+ if (freetype_library_type STREQUAL STATIC_LIBRARY)
+ set(freetype_library_type STATIC)
++ elseif (freetype_library_type STREQUAL SHARED_LIBRARY)
++ set(freetype_library_type SHARED)
+ endif()
+ get_target_property(freetype_interface_include_directories freetype INTERFACE_INCLUDE_DIRECTORIES)
+ get_target_property(freetype_interface_link_libraries freetype INTERFACE_LINK_LIBRARIES)