Enhance CMake configuration and remove deprecated files

- Added support for cpp-library version 5.2.0 using CPM.
- Introduced a base preset in CMakePresets.json to streamline configuration.
- Generated adobe/config.hpp from the project version, ensuring it reflects the current build.
- Removed obsolete files: adobe/config.hpp, various Boost patch files, and Sublime project files.
- Cleaned up CMakeLists.txt to improve organization and clarity.

Author: sean-parent

CMakeLists.txt

@@ -1,5 +1,20 @@
 cmake_minimum_required(VERSION 3.29)
+include(cmake/CPM.cmake)
+
+# Add cpp-library for set version
+# CPMAddPackage(
+#     NAME cpp-library
+#     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../cpp-library"
+# )
+CPMAddPackage("gh:stlab/cpp-library@5.2.0")
+include(${cpp-library_SOURCE_DIR}/cpp-library.cmake)
+
 project(adobe-source-libraries CXX)
+
+cpp_library_set_version()
+
+################################################################################
+
 include(FindGit)
 include(CMakeParseArguments)
 
@@ -11,13 +26,6 @@ if(WIN32)
     set(CMAKE_OBJECT_PATH_MAX 500)
 endif()
 
-################################################################################
-
-# Enable CPM caching to avoid re-downloading dependencies. Must be before CPM.cmake include.
-set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm CACHE PATH "Directory to cache CPM packages" FORCE)
-
-include(cmake/CPM.cmake)
-
 ################################################################################
 # Dependencies
 
@@ -39,16 +47,6 @@ endif(NOT DEFINED CMAKE_CXX_STANDARD)
 
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 
-# Create symlink to compile_commands.json for clangd
-if(CMAKE_EXPORT_COMPILE_COMMANDS AND PROJECT_IS_TOP_LEVEL)
-    add_custom_target(clangd_compile_commands ALL
-        COMMAND ${CMAKE_COMMAND} -E create_symlink
-            ${CMAKE_BINARY_DIR}/compile_commands.json
-            ${CMAKE_SOURCE_DIR}/compile_commands.json
-        COMMENT "Creating symlink to compile_commands.json for clangd"
-    )
-endif()
-
 # https://github.com/boostorg/boost/releases
 CPMAddPackage(
     NAME Boost
@@ -104,7 +102,6 @@ if(BUILD_DOCS)
         # Set variables for Doxyfile template
         set(PROJECT_NAME "Adobe Source Libraries")
         set(PROJECT_BRIEF "A collection of C++ libraries.")
-        set(PROJECT_VERSION "2.0.2")
         set(INPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
         set(OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
         set(AWESOME_CSS_PATH "${AWESOME_CSS_DIR}")

CMakePresets.json

@@ -1,8 +1,18 @@
 {
     "version": 3,
     "configurePresets": [
+        {
+            "name": "base",
+            "displayName": "base",
+            "description": "Base configuration",
+            "cacheVariables": {
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+                "CPM_SOURCE_CACHE": "${sourceDir}/.cache/cpm"
+            }
+        },
         {
             "name": "debug",
+            "inherits": "base",
             "displayName": "debug-windows",
             "description": "Sets Ninja generator, build and install directory",
             "generator": "Ninja",
@@ -26,6 +36,7 @@
         },
         {
             "name": "debug-windows-cpp17",
+            "inherits": "base",
             "displayName": "windows-debug-C++17",
             "description": "Sets Ninja generator, build and install directory",
             "generator": "Ninja",
@@ -49,6 +60,7 @@
         },
         {
             "name": "macos-debug-C++20",
+            "inherits": "base",
             "displayName": "macos-debug-C++20",
             "description": "Sets Ninja generator, build and install directory",
             "generator": "Ninja",
@@ -68,6 +80,7 @@
         },
         {
             "name": "macos-debug-C++17",
+            "inherits": "base",
             "displayName": "macos-debug-C++17",
             "description": "Sets Ninja generator, build and install directory",
             "generator": "Ninja",
@@ -79,6 +92,7 @@
         },
         {
             "name": "clang-tidy-base",
+            "inherits": "base",
             "hidden": true,
             "generator": "Ninja",
             "binaryDir": "${sourceParentDir}/build/asl-${presetName}",
@@ -107,18 +121,19 @@
         },
         {
             "name": "clang-tidy-fix",
+            "inherits": "base",
             "hidden": false,
             "generator": "Ninja",
             "binaryDir": "${sourceParentDir}/build/asl-${presetName}",
             "cacheVariables": {
                 "CMAKE_CXX_STANDARD": "17",
                 "CMAKE_BUILD_TYPE": "DEBUG",
-                "CMAKE_CXX_CLANG_TIDY":
-                    "clang-tidy;--fix;--allow-no-checks;--extra-arg=/EHsc;--extra-arg=/DNOMINMAX"
+                "CMAKE_CXX_CLANG_TIDY": "clang-tidy;--fix;--allow-no-checks;--extra-arg=/EHsc;--extra-arg=/DNOMINMAX"
             }
         },
         {
             "name": "clang-tidy-nofix",
+            "inherits": "base",
             "hidden": false,
             "generator": "Ninja",
             "binaryDir": "${sourceParentDir}/build/asl-${presetName}",
@@ -135,19 +150,21 @@
             }
         },
         {
-        "name": "test",
-        "displayName": "Test Configuration",
-        "description": "Configuration for building and running tests",
-        "binaryDir": "${sourceDir}/build/test",
-        "generator": "Ninja",
-        "cacheVariables": {
+            "name": "test",
+            "inherits": "base",
+            "displayName": "Test Configuration",
+            "description": "Configuration for building and running tests",
+            "binaryDir": "${sourceDir}/build/test",
+            "generator": "Ninja",
+            "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
                 "BUILD_TESTING": "ON",
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
             }
         },
         {
             "name": "docs",
+            "inherits": "base",
             "displayName": "Documentation Configuration",
             "description": "Configuration for building documentation",
             "binaryDir": "${sourceDir}/build/docs",
@@ -165,11 +182,11 @@
             "configurePreset": "debug"
         },
         {
-        "name": "docs",
-        "displayName": "Build Documentation",
-        "description": "Build the documentation",
-        "configurePreset": "docs",
-        "targets": "docs"
+            "name": "docs",
+            "displayName": "Build Documentation",
+            "description": "Build the documentation",
+            "configurePreset": "docs",
+            "targets": "docs"
         }
     ],
     "testPresets": [
@@ -183,4 +200,4 @@
             }
         }
     ]
-}
+}

adobe/config.hpp adobe/config.hpp.inadobe/config.hpp renamed to adobe/config.hpp.in

@@ -23,11 +23,13 @@
         ADOBE_VERSION % 100 is the sub-minor version
         ADOBE_VERSION / 100 % 1000 is the minor version
         ADOBE_VERSION / 100000 is the major version
+
+    Version is generated by CMake from the project version (set by cpp_library_set_version).
 */
 
-#define ADOBE_VERSION_MAJOR 1
-#define ADOBE_VERSION_MINOR 0
-#define ADOBE_VERSION_SUBMINOR 46
+#define ADOBE_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+#define ADOBE_VERSION_MINOR @PROJECT_VERSION_MINOR@
+#define ADOBE_VERSION_SUBMINOR @PROJECT_VERSION_PATCH@
 
 #define ADOBE_VERSION                                                                              \
     (ADOBE_VERSION_MAJOR * 100000 + ADOBE_VERSION_MINOR * 100 + ADOBE_VERSION_SUBMINOR)

source/CMakeLists.txt

@@ -1,8 +1,19 @@
+# Generate adobe/config.hpp from CMake project version (set by cpp_library_set_version)
+file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/adobe")
+configure_file(
+    "${PROJECT_SOURCE_DIR}/adobe/config.hpp.in"
+    "${PROJECT_BINARY_DIR}/adobe/config.hpp"
+    @ONLY
+)
+
 aux_source_directory(. SRC_LIST)
 file(GLOB_RECURSE INC_LIST ../adobe/*.hpp)
 add_library(asl ${SRC_LIST} ${INC_LIST})
 
-target_include_directories(asl PUBLIC ..)
+# Binary dir first so generated config.hpp is used; .. is project root for other adobe headers
+target_include_directories(asl PUBLIC
+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
 target_compile_definitions(asl PUBLIC ADOBE_STD_SERIALIZATION)
 
 # otherwise boost concept checking fails on adobe::selection_t because it lacks non const begin/end