From 7876f329a95c361bae2805ad8117e62f4e0b65e1 Mon Sep 17 00:00:00 2001 From: Andrey Karpov Date: Wed, 20 Jun 2018 12:35:22 +0300 Subject: FindJPEG: Add forgotten names of libraries for Debug configuration The change in commit v3.12.0-rc1~202^2~1 (FindJPEG: Add multi config support and associated docs, 2018-04-17) accidentally left out the default jpeg library names from consideration for debug variants. --- Modules/FindJPEG.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index 61a2213..710188e 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -52,7 +52,7 @@ find_path(JPEG_INCLUDE_DIR jpeglib.h) set(jpeg_names ${JPEG_NAMES} jpeg jpeg-static libjpeg libjpeg-static) -foreach(name ${JPEG_NAMES}) +foreach(name ${jpeg_names}) list(APPEND jpeg_names_debug "${name}d") endforeach() -- cgit v0.12 From ae4a548302bf029fc7393dfbcd25d51746845127 Mon Sep 17 00:00:00 2001 From: Andrey Karpov Date: Wed, 20 Jun 2018 12:41:11 +0300 Subject: FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables These have been deprecated since 2002! --- Modules/FindJPEG.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index 710188e..7290724 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -122,10 +122,4 @@ if(JPEG_FOUND) endif() endif() -# Deprecated declarations. -set(NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR}) -if(JPEG_LIBRARY) - get_filename_component(NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH) -endif() - mark_as_advanced(JPEG_LIBRARY JPEG_INCLUDE_DIR) -- cgit v0.12