From 0c4d2be71b42bfe1348edbe969306b70407ff71d Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 8 Mar 2025 19:08:04 +0100 Subject: CMake: set FLTK_OPTION_STD effectively "always on" Temporarily done by setting the internal variable FLTK_USE_STD to 1. This affects FL/fl_config.h where FLTK_USE_STD will always be 1. Source code that checks this variable should be fixed soon. --- CMake/options.cmake | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/CMake/options.cmake b/CMake/options.cmake index 6c06ca9c1..a9c41264d 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -387,12 +387,17 @@ if(WIN32) endif(WIN32) ####################################################################### -option(FLTK_OPTION_STD "allow FLTK to use some std:: features" OFF) -if(FLTK_OPTION_STD) - set(FLTK_USE_STD 1) -else() - set(FLTK_USE_STD 0) -endif() +# FLTK_OPTION_STD: temporary option in 1.4, always on in 1.5. +# FIXME: remove this obsolete option entirely ... +# after the source code has been fixed. +####################################################################### + +option(FLTK_OPTION_STD + "Use std:: (obsolete since 1.5.0, ignored: always ON)" + ON) + +set(FLTK_USE_STD 1) # always ON since FLTK 1.5.0, option will be + # removed as soon as the code has been updated ####################################################################### -- cgit v1.2.3