From 81d3ccefa4b6c3cbaeab20231b2c39705dfb3fb8 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Wed, 9 Oct 2024 16:01:54 +0200 Subject: CMake: ignore FLTK_MSVC_RUNTIME_DLL on other platforms This commit suppresses a CMake warning if FLTK_MSVC_RUNTIME_DLL is defined on the CMake commandline on platforms that don't use it. --- CMake/options.cmake | 6 ++++++ README.CMake.txt | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMake/options.cmake b/CMake/options.cmake index 2f3b36337..cabdf4e6b 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -95,6 +95,12 @@ if(WIN32 AND NOT MINGW AND NOT MSYS) else() set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") endif() +else(WIN32 AND NOT MINGW AND NOT MSYS) + # suppress CMake warning if the user sets FLTK_MSVC_RUNTIME_DLL on other platforms + if(DEFINED FLTK_MSVC_RUNTIME_DLL) + unset(FLTK_MSVC_RUNTIME_DLL) + unset(FLTK_MSVC_RUNTIME_DLL CACHE) + endif() endif(WIN32 AND NOT MINGW AND NOT MSYS) ####################################################################### diff --git a/README.CMake.txt b/README.CMake.txt index 37c47ee4a..2fd48223b 100644 --- a/README.CMake.txt +++ b/README.CMake.txt @@ -217,10 +217,11 @@ FLTK_GRAPHICS_GDIPLUS - default ON (Windows only). Make FLTK use GDI+ to draw oblique lines and curves resulting in antialiased graphics. If this option is OFF standard GDI is used. -FLTK_MSVC_RUNTIME_DLL - default ON (Windows only: Visual Studio and NMake). +FLTK_MSVC_RUNTIME_DLL - default ON (Windows: Visual Studio, NMake, clang). Select whether the build uses the MS runtime DLL (ON) or not (OFF). Default is ON: either /MD or /MDd for Release or Debug, respectively. Select OFF for either /MT or /MTd for Release or Debug, respectively. + If this variable is defined on other platforms it is silently ignored. FLTK_OPTION_CAIRO_EXT - default OFF Enable extended libcairo support - see README.Cairo.txt. -- cgit v1.2.3