summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2025-03-08 19:08:04 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2025-03-08 19:08:04 +0100
commit0c4d2be71b42bfe1348edbe969306b70407ff71d (patch)
tree6ecf206693c55d8bed2700225f158f61a8596a37
parent6a12e5a60946aad3ef86a252ccad7f154166d9a1 (diff)
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.
-rw-r--r--CMake/options.cmake17
1 files 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
#######################################################################