Sync with 2b95866 (#81)

Author: jdumas

.github/.git_archival.txt

@@ -0,0 +1,3 @@
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$

.github/workflows/continuous.yaml

@@ -64,8 +64,11 @@ jobs:
 
       - name: Checkout repository
         uses: actions/checkout@v4
+        # Note: Update to actions/checkout@6 once 6.0.2 is out, and remove the fetch-depth: 0
+        # https://github.com/actions/checkout/issues/1471
         with:
-          fetch-depth: 10
+          fetch-tags: true
+          fetch-depth: 0
 
       - name: Install Ninja
         uses: seanmiddleditch/gha-setup-ninja@master
@@ -171,7 +174,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 10
+          fetch-tags: true
+          fetch-depth: 0
 
       - uses: actions/setup-python@v5
         with:

.github/workflows/wheel.yaml

@@ -21,6 +21,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+          fetch-depth: 0
 
       - name: Setup Xcode version
         if: matrix.os == 'macos-15-intel'

.gitignore

@@ -32,8 +32,8 @@ __pycache__
 # Python folders
 *.egg-info
 
-# Nightly version file
-/VERSION_NIGHTLY
+# Python version file
+modules/python/lagrange/_version.py
 
 # Lock files
 uv.lock

CMakeLists.txt

@@ -103,10 +103,27 @@ if(LAGRANGE_TOPLEVEL_PROJECT AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
 endif()
 
 ################################################################################
-file(READ "VERSION" lagrange_version)
-string(STRIP ${lagrange_version} lagrange_version)
+
+if(SKBUILD)
+    # Version number dictated by setuptools_scm
+    set(lagrange_version ${SKBUILD_PROJECT_VERSION})
+else()
+    # Set ${lagrange_version} according to git tag
+    include(cmake/lagrange/lagrange_cpm_cache.cmake)
+    include(cmake/recipes/external/DynamicVersion.cmake)
+    dynamic_version(
+        PROJECT_PREFIX Lagrange_
+        OUTPUT_VERSION lagrange_version
+        VERSION_FULL_MODE POST
+        GIT_ARCHIVAL_FILE "${CMAKE_CURRENT_LIST_DIR}/.github/.git_archival.txt"
+    )
+endif()
+
+message(STATUS "Using Lagrange version: ${lagrange_version}")
 project(Lagrange VERSION ${lagrange_version})
 
+################################################################################
+
 if(MINGW)
     message(FATAL_ERROR "Please use the MSVC compiler on Windows")
 endif()

VERSION

@@ -9,6 +9,7 @@
 # OF ANY KIND, either express or implied. See the License for the specific language
 # governing permissions and limitations under the License.
 #
+include_guard(GLOBAL)
 
 if(DEFINED ENV{CPM_SOURCE_CACHE})
     set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE})

cmake/lagrange/lagrange_cpm_cache.cmake

@@ -42,7 +42,7 @@ CPMAddPackage(
 )
 
 set(ENV{VCPKG_ROOT} "${vcpkg_SOURCE_DIR}")
-set(ENV{VCPKG_KEEP_ENV_VARS} "VCPKG_ROOT" $ENV{VCPKG_KEEP_ENV_VARS})
+set(ENV{VCPKG_KEEP_ENV_VARS} "VCPKG_ROOT;$ENV{VCPKG_KEEP_ENV_VARS}")
 
 # Since this file is included as a toolchain file via our CMake preset, we setup vcpkg.cmake
 # via CMAKE_PROJECT_TOP_LEVEL_INCLUDES instead. See the following threads for more information:

cmake/lagrange/lagrange_vcpkg_toolchain.cmake

@@ -0,0 +1,38 @@
+#
+# Copyright 2025 Adobe. All rights reserved.
+# This file is licensed to you under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License. You may obtain a copy
+# of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under
+# the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+# OF ANY KIND, either express or implied. See the License for the specific language
+# governing permissions and limitations under the License.
+#
+include_guard(GLOBAL)
+
+# Using full path because this is included early in our root CMakeLists.txt
+include(${CMAKE_CURRENT_LIST_DIR}/CPM.cmake)
+CPMAddPackage(
+    NAME CMakeExtraUtils
+    GITHUB_REPOSITORY LecrisUT/CMakeExtraUtils
+    GIT_TAG v0.4.1
+
+    # There is a bug in CPM when using DOWNLOAD_ONLY that before the first project() call.
+    # Because CPM attempts to bypass FetchContent, subsequent calls to FetchContent_GetProperties()
+    # may not give any result. This seems to only happen when the package is added with DOWNLOAD_ONLY.
+    #
+    # https://github.com/cpm-cmake/CPM.cmake/issues/227
+    #
+    SOURCE_SUBDIR cmake
+)
+
+# Due to the bug mentioned above, ${cmakeextrautils_SOURCE_DIR} can point to either the subdir or
+# the root dir of the CMakeExtraUtils, depending on whether the cache is already populated. This is
+# really ugly, but have to work around it for now.
+FetchContent_GetProperties(CMakeExtraUtils)
+if(EXISTS ${cmakeextrautils_SOURCE_DIR}/DynamicVersion.cmake)
+    include(${cmakeextrautils_SOURCE_DIR}/DynamicVersion.cmake)
+else()
+    include(${cmakeextrautils_SOURCE_DIR}/cmake/DynamicVersion.cmake)
+endif()

cmake/recipes/external/DynamicVersion.cmake

@@ -26,7 +26,7 @@ else()
     CPMAddPackage(
         NAME eigen
         GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
-        GIT_TAG 3.4.0
+        GIT_TAG 3.4.1
         DOWNLOAD_ONLY ON
     )
     set(EIGEN_INCLUDE_DIRS ${eigen_SOURCE_DIR})