FLTK main merged, 2023-02-18-1

.gitignore

@@ -2,10 +2,15 @@
 # Files to be ignored by Git (do not commit)
 #
 
-*.o
+# Ignore everywhere, also in subdirectories
+
+*.bck
 *.exe
+*.o
+**/.DS_Store
+
+# CMake build artifacts if built in source - not recommended, but anyway
 
-# CMake
 bin/
 **/cmake_install.cmake
 **/CMakeCache.txt
@@ -19,13 +24,16 @@ FLTKConfig.cmake
 etc/FLTKConfig.cmake
 
 # MSVC
+
 *.tlog
 .vs/
 
 # VS Code (Visual Studio Code) Editor
+
 .vscode/
 
 # /
+
 /autom4te*.cache
 /build
 /clang
@@ -38,20 +46,19 @@ etc/FLTKConfig.cmake
 /fltk.list
 /fltk.spec
 /makeinclude
-/*.bck
 /TAGS
 
 # /FL
+
 /FL/fl_config.h
 /FL/Makefile
-/FL/*.bck
 
 # /cairo/
+
 /cairo/*.so*
 /cairo/*.dll
 
-# /documentation/
-# see documentation/.gitignore
+# /lib/
 
 # /examples/
 # see examples/.gitignore
@@ -129,13 +136,14 @@ etc/FLTKConfig.cmake
 /lib/*.a
 
 # /misc/
+
 /misc/doxystar
 
 # /src/
+
 /src/*.so*
 /src/*.sl*
 /src/*.a
-/src/*.bck
 /src/*.dll
 /src/*.sav
 /src/*.dylib
@@ -153,7 +161,10 @@ src/xdg-shell-protocol.c
 
 # libdecor/build/demo
 # libdecor/build/egl
-
+/out/build/x64-Debug/.cmake/api/v1/query/client-MicrosoftVS/query.json
+/out/build/x64-Debug
+/CMakeSettings.json
+/CppProperties.json
 **/.DS_Store
 *.back
 *.bak

CMake/fl_create_example.cmake

@@ -138,8 +138,10 @@ function (CREATE_EXAMPLE NAME SOURCES LIBRARIES)
                             "${CMAKE_CURRENT_SOURCE_DIR}/mac-resources/${PLIST}")
     endif()
 
+    string(REPLACE "_" "-" FLTK_BUNDLE_ID "org.fltk.${TARGET_NAME}")
     set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "${TARGET_NAME}")
-    set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.fltk.${TARGET_NAME}")
+    set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "${FLTK_BUNDLE_ID}")
+    set_target_properties (${TARGET_NAME} PROPERTIES XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "${FLTK_BUNDLE_ID}")
 
     if (ICON_NAME)
       set_target_properties (${TARGET_NAME} PROPERTIES MACOSX_BUNDLE_ICON_FILE ${ICON_NAME})

CMake/install.cmake

@@ -125,6 +125,9 @@ if (UNIX OR MSYS OR MINGW)
   if (FLTK_BUILD_FLUID)
     INSTALL_MAN (fluid 1)
   endif (FLTK_BUILD_FLUID)
+  if (FLTK_BUILD_FLTK_OPTIONS)
+    INSTALL_MAN (fltk-options 1)
+  endif (FLTK_BUILD_FLTK_OPTIONS)
   INSTALL_MAN (fltk-config 1)
   INSTALL_MAN (fltk 3)
 

CMake/options.cmake

@@ -360,9 +360,10 @@ option (OPTION_BUILD_SHARED_LIBS
 option (OPTION_PRINT_SUPPORT "allow print support" ON)
 option (OPTION_FILESYSTEM_SUPPORT "allow file system support" ON)
 
-option (FLTK_BUILD_FLUID    "Build FLUID"              ON)
-option (FLTK_BUILD_TEST     "Build test/demo programs" ON)
-option (FLTK_BUILD_EXAMPLES "Build example programs"   OFF)
+option (FLTK_BUILD_FLUID        "Build FLUID"              ON)
+option (FLTK_BUILD_FLTK_OPTIONS "Build fltk-options"       ON)
+option (FLTK_BUILD_TEST         "Build test/demo programs" ON)
+option (FLTK_BUILD_EXAMPLES     "Build example programs"   OFF)
 
 if (DEFINED OPTION_BUILD_EXAMPLES)
   message (WARNING

CMake/setup.cmake

@@ -2,7 +2,7 @@
 # CMakeLists.txt to build the FLTK project using CMake (www.cmake.org)
 # Originally written by Michael Surette
 #
-# Copyright 1998-2022 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
@@ -97,13 +97,10 @@ if (APPLE)
   set (HAVE_SCANDIR 1)
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
   if (OPTION_APPLE_X11)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U__APPLE__")
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U__APPLE__")
     if (NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 17.0.0)) # a.k.a. macOS version ≥ 10.13
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_HAS_THREAD_API_PTHREAD")
     endif (NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 17.0.0))
   else ()
-    set (__APPLE_QUARTZ__ 1)
     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")
     set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa")
   endif (OPTION_APPLE_X11)

CMakeLists.txt

@@ -115,6 +115,14 @@ if (FLTK_BUILD_FLUID)
   add_subdirectory (fluid)
 endif (FLTK_BUILD_FLUID)
 
+#######################################################################
+# build fltk-options
+#######################################################################
+
+if (FLTK_BUILD_FLTK_OPTIONS)
+  add_subdirectory (fltk-options)
+endif (FLTK_BUILD_FLTK_OPTIONS)
+
 #######################################################################
 # variables shared by export and install
 # export.cmake creates configuration files for direct use in a built but uninstalled FLTK
@@ -214,9 +222,15 @@ endif ()
 
 if (FLTK_BUILD_FLUID)
    message (STATUS "FLUID will be built in ${CMAKE_CURRENT_BINARY_DIR}/bin/fluid")
- else ()
+else ()
    message (STATUS "FLUID will not be built (set FLTK_BUILD_FLUID=ON to build)")
- endif ()
+endif ()
+
+if (FLTK_BUILD_FLTK_OPTIONS)
+   message (STATUS "fltk-options will be built in ${CMAKE_CURRENT_BINARY_DIR}/bin/fltk-options")
+else ()
+   message (STATUS "fltk-options will not be built (set FLTK_BUILD_FLTK_OPTIONS=ON to build)")
+endif ()
 
 if (FLTK_BUILD_TEST)
   message (STATUS "Test programs    will be built in ${CMAKE_CURRENT_BINARY_DIR}/bin/test")