CMake: fix variables used for FreeType

CMake with `--warn-uninitialized -Werror=dev` identified there was a problem
here:

  CMake Error (dev) at plugin/lasi/CMakeLists.txt:25 (target_include_directories):
    uninitialized variable 'Freetype_INCLUDE_DIRS'

  CMake Error (dev) at plugin/lasi/CMakeLists.txt:31 (target_link_libraries):
    uninitialized variable 'Freetype_LIBRARIES'

Gitlab: fixes #2291

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7280599020029c832396c75b64f1e24039f1649..38040bdf132b672e2a216948eda6d728992b6e37 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The CMake build system no longer uses the final install location as the
   staging area for example graphs and templates during `cpack`. This bug was
   introduced in Graphviz 4.0.0. #2232
-- The CMake build system uses a corrected path to DevIL headers when discovered.
+- The CMake build system uses corrected paths to DevIL and FreeType headers and
+  libraries when discovered.
 
 ## [7.0.0] – 2022-10-22
 

diff --git a/cmd/smyrna/CMakeLists.txt b/cmd/smyrna/CMakeLists.txt
index babe6eb1425b72e2165c9646efa1aca66c468aed..e2df6005941acaf4050f968d40763a7fca41b69b 100644 (file)
--- a/cmd/smyrna/CMakeLists.txt
+++ b/cmd/smyrna/CMakeLists.txt
@@ -87,7 +87,7 @@ if(with_smyrna)
   target_include_directories(smyrna SYSTEM PRIVATE
     ${EXPAT_INCLUDE_DIRS}
     ${FONTCONFIG_INCLUDE_DIRS}
-    ${Freetype_INCLUDE_DIRS}
+    ${FREETYPE_INCLUDE_DIRS}
     ${GLUT_INCLUDE_DIRS}
     ${GTK2_INCLUDE_DIRS}
     ${GTKGLEXT_INCLUDE_DIRS}
@@ -109,7 +109,7 @@ if(with_smyrna)
     xdot
     ${EXPAT_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}
-    ${Freetype_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
     ${GLUT_LIBRARIES}
     ${GTK2_LIBRARIES}
     ${GTKGLEXT_LIBRARIES}

diff --git a/lib/glcomp/CMakeLists.txt b/lib/glcomp/CMakeLists.txt
index 536fd05ca1f47100eda932b19fbf959348b6da02..fd9c7c872002ce2e16a8a0557e4363f8ce231eca 100644 (file)
--- a/lib/glcomp/CMakeLists.txt
+++ b/lib/glcomp/CMakeLists.txt
@@ -41,7 +41,7 @@ if(with_smyrna)
   )
 
   target_include_directories(glcomp SYSTEM PRIVATE
-    ${Freetype_INCLUDE_DIRS}
+    ${FREETYPE_INCLUDE_DIRS}
     ${GLUT_INCLUDE_DIRS}
     ${GTK2_INCLUDE_DIRS}
     ${PANGOCAIRO_INCLUDE_DIRS}
@@ -53,7 +53,7 @@ if(with_smyrna)
   endif()
 
   target_link_libraries(glcomp PRIVATE
-    ${Freetype_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
     ${GLUT_LIBRARIES}
     ${GTK2_LIBRARIES}
     ${PANGOCAIRO_LIBRARIES}

diff --git a/plugin/lasi/CMakeLists.txt b/plugin/lasi/CMakeLists.txt
index f7f20d6aaf16c82865d61e17101c90607ceb8e3d..e3f7abd9a96531e77a91dd226671670029bc92b5 100644 (file)
--- a/plugin/lasi/CMakeLists.txt
+++ b/plugin/lasi/CMakeLists.txt
@@ -23,13 +23,13 @@ if(Freetype_FOUND AND LASI_FOUND AND PANGOCAIRO_FOUND)
   )
 
   target_include_directories(gvplugin_lasi SYSTEM PRIVATE
-    ${Freetype_INCLUDE_DIRS}
+    ${FREETYPE_INCLUDE_DIRS}
     ${LASI_INCLUDE_DIRS}
     ${PANGOCAIRO_INCLUDE_DIRS}
   )
 
   target_link_libraries(gvplugin_lasi
-    ${Freetype_LIBRARIES}
+    ${FREETYPE_LIBRARIES}
     ${LASI_LIBRARIES}
     ${PANGOCAIRO_LIBRARIES}
   )