From d3f9f5120c05e4756d7ee1ed81917f74583455a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 24 Nov 2016 12:26:56 +0100 Subject: FindDevIL: fail properly when library is not found. Due to a mismatch between module name and name passed to FPHSA() the macro printed an error message but the error was not caught up by CMake. Fix the typo. --- Modules/FindDevIL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindDevIL.cmake b/Modules/FindDevIL.cmake index dc8e38a..4b6128b 100644 --- a/Modules/FindDevIL.cmake +++ b/Modules/FindDevIL.cmake @@ -67,6 +67,6 @@ find_library(ILU_LIBRARIES #message("ILU_LIBRARIES is ${ILU_LIBRARIES}") -FIND_PACKAGE_HANDLE_STANDARD_ARGS(IL DEFAULT_MSG +FIND_PACKAGE_HANDLE_STANDARD_ARGS(DevIL DEFAULT_MSG IL_LIBRARIES ILU_LIBRARIES ILUT_LIBRARIES IL_INCLUDE_DIR) -- cgit v0.12 From 7abb12c826cad6e5847c32d4769c076732581901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 24 Nov 2016 12:40:22 +0100 Subject: FindDevIL: Make the ILUT library optional Some distributions (such as ArchLinux) have only the IL and ILU libraries and since these are mainly used, the module should succeed even though ILUT was not found. Removed it from the FPHSA() macro call, making it effectively optional. --- Modules/FindDevIL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindDevIL.cmake b/Modules/FindDevIL.cmake index 4b6128b..45fab82 100644 --- a/Modules/FindDevIL.cmake +++ b/Modules/FindDevIL.cmake @@ -69,4 +69,4 @@ find_library(ILU_LIBRARIES FIND_PACKAGE_HANDLE_STANDARD_ARGS(DevIL DEFAULT_MSG IL_LIBRARIES ILU_LIBRARIES - ILUT_LIBRARIES IL_INCLUDE_DIR) + IL_INCLUDE_DIR) -- cgit v0.12