From 5fd182ee5067585b0e1cda8d83998f7a6ef357d8 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sun, 13 Mar 2022 19:50:13 +0100 Subject: CMake/Windows (MSVC): remove confusing CMake warning The Visual Studio generator does often not find GL/glu.h and locale.h although these headers are in the Visual Studio SDK. The warning has been changed to "info" and the unnecessary and sometimes confusing recommendation to rerun CMake has been removed. --- CMake/resources.cmake | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'CMake') diff --git a/CMake/resources.cmake b/CMake/resources.cmake index 611c72e37..6841a5101 100644 --- a/CMake/resources.cmake +++ b/CMake/resources.cmake @@ -88,42 +88,22 @@ endif () # menu it doesn't have the correct paths to find these header files. # The CMake folks recommend not to search for these files at all, because # they must always be there, but we do anyway. -# If we don't find them we issue a warning and suggest to rerun CMake from -# a "Developer Command Prompt for Visual Studio xxxx", but we fix the issue -# by setting the *local* instance (not the cache variable) of the corresponding -# CMake variable to '1' since we "know" the header file is available. -# -# If the user builds the solution, everything should run smoothly despite -# the fact that the header files were not found. -# -# If the configuration is changed somehow (e.g. by editing CMakeLists.txt) -# CMake will be rerun from within Visual Studio, find the header file, and -# set the cache variable for the header file to its correct path. The latter is -# only informational so you can see that (and where) the headers were found. +# If we don't find them we issue a warning and continue anyway. # # Note: these cache variables can only be seen in "advanced" mode. if (MSVC) - set (MSVC_RERUN_MESSAGE FALSE) if (NOT HAVE_GL_GLU_H) - message (STATUS "Warning: Header file GL/glu.h was not found.") + message (STATUS "Info: Header file GL/glu.h was not found. Continuing...") set (HAVE_GL_GLU_H 1) - set (MSVC_RERUN_MESSAGE TRUE) endif (NOT HAVE_GL_GLU_H) if (NOT HAVE_LOCALE_H) - message (STATUS "Warning: Header file locale.h was not found.") + message (STATUS "Info: Header file locale.h was not found. Continuing...") set (HAVE_LOCALE_H 1) - set (MSVC_RERUN_MESSAGE TRUE) endif (NOT HAVE_LOCALE_H) - if (MSVC_RERUN_MESSAGE) - message (STATUS "The FLTK team recommends to rerun CMake from a") - message (STATUS "\"Developer Command Prompt for Visual Studio xxxx\"") - endif (MSVC_RERUN_MESSAGE) - - unset (MSVC_RERUN_MESSAGE) endif (MSVC) # Simulate the behavior of autoconf macro AC_HEADER_DIRENT, see: -- cgit v1.2.3