DevIL plugin: use IL_ CMake variables
authorMark Hansen <markhansen@google.com>
Sat, 8 Oct 2022 05:58:56 +0000 (16:58 +1100)
committerMark Hansen <markhansen@google.com>
Wed, 12 Oct 2022 06:05:32 +0000 (17:05 +1100)
https://cmake.org/cmake/help/latest/module/FindDevIL.html#result-variables
mentions that FindDevIL CMake module sets the following, frustratingly
inconsistent variables:

- IL_LIBRARIES
- IL_INCLUDE_DIR
- DevIL_FOUND

Note I can't actually test this on my local machine, so I'll be relying
on CI.

Fixes #2289

plugin/devil/CMakeLists.txt

index 2f595c99dec2b8604a0622948e0d63dc8f4570c9..55ca5c4deac7b1676e2c3cad9369f19b9e57429c 100644 (file)
@@ -19,12 +19,12 @@ if(PANGOCAIRO_FOUND AND DevIL_FOUND)
 
   target_include_directories(gvplugin_devil SYSTEM PRIVATE
     ${PANGOCAIRO_INCLUDE_DIRS}
-    ${DevIL_INCLUDE_DIRS}
+    ${IL_INCLUDE_DIRS}
   )
 
   target_link_libraries(gvplugin_devil
     ${PANGOCAIRO_LIBRARIES}
-    ${DevIL_LIBRARIES}
+    ${IL_LIBRARIES}
   )
 
   install(