mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake/MSVC: remove confusing recommendation to rerun CMake

Browse Source 
... if GL or locale headers are not found. These headers will be
  resolved by the Visual Studio SDK (backported from 1.4).

Also improve finding the GLEW library on Windows (named 'glew32')
  (backported from 1.4).
This commit is contained in:
Albrecht Schlosser 2023-12-07 19:49:31 +01:00
parent c17d42c7e7
commit 74187844a2
1 changed files with 5 additions and 25 deletions

30
CMake/resources.cmake
View File

@ -2,7 +2,7 @@
# Resource definitions to build the FLTK project using CMake (www.cmake.org)
# Written by Michael Surette
#
# Copyright 1998-2021 by Bill Spitzak and others.
# Copyright 1998-2023 by Bill Spitzak and others.
#
# This library is free software. Distribution and use rights are outlined in
# the file "COPYING" which should have been included with this file. If this
@ -78,42 +78,22 @@ endif (WIN32 AND NOT CYGWIN)
# 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:
@ -169,7 +149,7 @@ endif (NOT APPLE)
find_library (LIB_freetype freetype)
find_library (LIB_GL GL)
find_library (LIB_MesaGL MesaGL)
find_library (LIB_GLEW GLEW)
find_library (LIB_GLEW NAMES GLEW glew32)
find_library (LIB_jpeg jpeg)
find_library (LIB_png png)
find_library (LIB_zlib z)