]> granicus.if.org Git - graphviz/commitdiff
CMake: fix include variable used for DevIL
authorMatthew Fernandez <matthew.fernandez@gmail.com>
Sat, 5 Nov 2022 18:53:05 +0000 (11:53 -0700)
committerMatthew Fernandez <matthew.fernandez@gmail.com>
Tue, 8 Nov 2022 04:52:51 +0000 (20:52 -0800)
b5f4448a3f3a70e14ba7d6990b81506cbda82180 made this closer to correct but still
wrong. As its message mentioned, FindDevIL.cmake is frustratingly inconsistent¹
with respect to the rest of the CMake ecosystem.

Gitlab: #2291

¹ https://cmake.org/cmake/help/latest/module/FindDevIL.html

CHANGELOG.md
plugin/devil/CMakeLists.txt

index 8dc98dd7385ec6aae7932103c8c667c50501fb56..e7280599020029c832396c75b64f1e24039f1649 100644 (file)
@@ -26,6 +26,7 @@ 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.
 
 ## [7.0.0] – 2022-10-22
 
index 55ca5c4deac7b1676e2c3cad9369f19b9e57429c..a49ac2b440c6d4ef030066d8e82e5ae2b874dd3b 100644 (file)
@@ -19,7 +19,7 @@ if(PANGOCAIRO_FOUND AND DevIL_FOUND)
 
   target_include_directories(gvplugin_devil SYSTEM PRIVATE
     ${PANGOCAIRO_INCLUDE_DIRS}
-    ${IL_INCLUDE_DIRS}
+    ${IL_INCLUDE_DIR}
   )
 
   target_link_libraries(gvplugin_devil