From 5a8b9d9130d9c9bd0adeca33ac051eb9249953fb Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 3 Apr 2022 23:34:09 +0200 Subject: Improve libpng header search (notably on macOS) Fix usage of internal cache variables so users can switch between system and builtin libpng reliably. --- CMake/resources.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'CMake/resources.cmake') diff --git a/CMake/resources.cmake b/CMake/resources.cmake index 6841a5101..b38156711 100644 --- a/CMake/resources.cmake +++ b/CMake/resources.cmake @@ -52,10 +52,8 @@ include (FindPkgConfig) fl_find_header (HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h) fl_find_header (HAVE_DLFCN_H dlfcn.h) fl_find_header (HAVE_GL_GLU_H GL/glu.h) -fl_find_header (HAVE_LIBPNG_PNG_H libpng/png.h) fl_find_header (HAVE_LOCALE_H locale.h) fl_find_header (HAVE_OPENGL_GLU_H OpenGL/glu.h) -fl_find_header (HAVE_PNG_H png.h) fl_find_header (HAVE_STDIO_H stdio.h) fl_find_header (HAVE_STRINGS_H strings.h) fl_find_header (HAVE_SYS_SELECT_H sys/select.h) @@ -128,8 +126,8 @@ endif (NOT HAVE_DIRENT_H) mark_as_advanced (HAVE_ALSA_ASOUNDLIB_H HAVE_DIRENT_H HAVE_DLFCN_H) mark_as_advanced (HAVE_GL_GLU_H) -mark_as_advanced (HAVE_LIBPNG_PNG_H HAVE_LOCALE_H HAVE_NDIR_H) -mark_as_advanced (HAVE_OPENGL_GLU_H HAVE_PNG_H) +mark_as_advanced (HAVE_OPENGL_GLU_H) +mark_as_advanced (HAVE_LOCALE_H HAVE_NDIR_H) mark_as_advanced (HAVE_PTHREAD_H HAVE_PTHREAD_MUTEX_RECURSIVE) mark_as_advanced (HAVE_STDIO_H HAVE_STRINGS_H HAVE_SYS_DIR_H) mark_as_advanced (HAVE_SYS_NDIR_H HAVE_SYS_SELECT_H) -- cgit v1.2.3