windows ci-workflows

.github/workflows/cmake.yml

@@ -43,3 +43,13 @@ jobs:
       run: cmake --workflow --preset="ci-clang-18-release"
     - name: clang-18-libc++-release
       run: cmake --workflow --preset="ci-clang-18-libc++-release"
+
+  build-and-test-msvc:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: ci-clangcl-release
+      run: cmake --workflow --preset="ci-clangcl-release"
+    - name: ci-msvc-release
+      run: cmake --workflow --preset="ci-msvc-release"
+

CMakePresets.json

@@ -55,15 +55,25 @@
       "inherits": [ "cfg-common", "cfg-build-dir", "cfg-ninja", "cfg-c++23" ],
       "cacheVariables": {"CMAKE_CXX_COMPILER": "g++-14" }
     },
+    {
+      "name": "ci-windows-base",
+      "hidden": true,
+      "inherits": ["cfg-common", "cfg-c++23", "cfg-build-dir"],
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    },
     {
       "name": "ci-clangcl-release",
-      "inherits": ["cfg-common", "cfg-build-dir"],
+      "inherits": ["ci-windows-base"],
       "generator": "Visual Studio 17 2022",
       "toolset": "ClangCL"
     },
     {
       "name": "ci-msvc-release",
-      "inherits": ["cfg-common", "cfg-build-dir"],
+      "inherits": ["ci-windows-base"],
       "generator": "Visual Studio 17 2022"
     }
   ],
@@ -79,6 +89,26 @@
     {
       "name": "ci-gcc-14-release",
       "configurePreset": "ci-gcc-14-release"
+    },
+    {
+      "name": "ci-clangcl-release",
+      "configurePreset": "ci-clangcl-release",
+      "configuration": "Release",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    },
+    {
+      "name": "ci-msvc-release",
+      "configurePreset": "ci-msvc-release",
+      "configuration": "Release",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
     }
   ],
   "testPresets": [
@@ -99,6 +129,30 @@
       "configurePreset": "ci-gcc-14-release",
       "output": {"outputOnFailure": true},
       "execution": {"noTestsAction": "error", "stopOnFailure": true}
+    },
+    {
+      "name": "ci-clangcl-release",
+      "configurePreset": "ci-clangcl-release",
+      "configuration": "Release",
+      "output": {"outputOnFailure": true},
+      "execution": {"noTestsAction": "error", "stopOnFailure": true},
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    },
+    {
+      "name": "ci-msvc-release",
+      "configurePreset": "ci-msvc-release",
+      "configuration": "Release",
+      "output": {"outputOnFailure": true},
+      "execution": {"noTestsAction": "error", "stopOnFailure": true},
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
     }
   ],
   "workflowPresets": [
@@ -152,6 +206,40 @@
           "name": "ci-gcc-14-release"
         }
       ]
+    },
+    {
+      "name": "ci-clangcl-release",
+      "steps": [
+        {
+          "type": "configure",
+          "name": "ci-clangcl-release"
+        },
+        {
+          "type": "build",
+          "name": "ci-clangcl-release"
+        },
+        {
+          "type": "test",
+          "name": "ci-clangcl-release"
+        }
+      ]
+    },
+    {
+      "name": "ci-msvc-release",
+      "steps": [
+        {
+          "type": "configure",
+          "name": "ci-msvc-release"
+        },
+        {
+          "type": "build",
+          "name": "ci-msvc-release"
+        },
+        {
+          "type": "test",
+          "name": "ci-msvc-release"
+        }
+      ]
     }
   ]
 }

cmake/CPM.cmake

@@ -2,8 +2,8 @@
 #
 # SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
 
-set(CPM_DOWNLOAD_VERSION 0.40.0)
-set(CPM_HASH_SUM "7b354f3a5976c4626c876850c93944e52c83ec59a159ae5de5be7983f0e17a2a")
+set(CPM_DOWNLOAD_VERSION 0.40.2)
+set(CPM_HASH_SUM "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d")
 
 if(CPM_SOURCE_CACHE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")

fixed_lib/include/fixedmath/core_ops.h

@@ -9,6 +9,8 @@
 #include "numbers.h"
 #include "detail/common.h"
 
+#include "detail/static_call_operator_prolog.h"
+
 namespace fixedmath::inline v2
   {
 //------------------------------------------------------------------------------------------------------
@@ -25,7 +27,7 @@ struct arithmetic_to_fixed_t
   template<concepts::arithmetic_and_not_fixed arithmetic_type>
   [[nodiscard, gnu::const, gnu::always_inline]]
   ///\returns fixed on success or NaN if source value is out of range
-  static constexpr auto operator()(arithmetic_type value) noexcept -> fixed_t
+  static_call_operator constexpr auto operator()(arithmetic_type value) static_call_operator_const noexcept -> fixed_t
     {
     if constexpr(std::is_integral_v<arithmetic_type>)
       {
@@ -74,7 +76,8 @@ template<concepts::arithmetic_and_not_fixed arithmethic_type>
 struct fixed_to_arithmetic_t
   {
   [[nodiscard, gnu::const, gnu::always_inline]]
-  static constexpr auto operator()(std::same_as<fixed_t> auto value) noexcept -> arithmethic_type
+  static_call_operator constexpr auto operator()(std::same_as<fixed_t> auto value
+  ) static_call_operator_const noexcept -> arithmethic_type
     {
     if constexpr(typetraits::is_integral_v<arithmethic_type>)
       {
@@ -105,3 +108,4 @@ constexpr fixed_t::operator arithmethic_type() const noexcept
 
   }  // namespace fixedmath::inline v2
 
+#include "detail/static_call_operator_epilog.h"

fixed_lib/include/fixedmath/detail/common.h

@@ -6,6 +6,7 @@
 
 #include "../types.h"
 #include <fixedmath/detail/type_traits.h>
+#include <bit>
 
 namespace fixedmath::inline v2::detail
   {

fixed_lib/include/fixedmath/detail/static_call_operator_epilog.h

@@ -0,0 +1,8 @@
+#ifndef STATIC_CALL_OPERATOR_INCLUDED
+#error "check inclusion of static_call_operator"
+#endif
+#undef STATIC_CALL_OPERATOR_INCLUDED
+
+#pragma pop_macro("static_call_operator_const")
+#pragma pop_macro("static_call_operator")
+

fixed_lib/include/fixedmath/detail/static_call_operator_prolog.h

@@ -0,0 +1,17 @@
+#ifdef STATIC_CALL_OPERATOR_INCLUDED
+#error "Multiple inclusion of static_call_operator"
+#endif
+#define STATIC_CALL_OPERATOR_INCLUDED
+
+#pragma push_macro("static_constexpr")
+#pragma push_macro("static_call_operator")
+#pragma push_macro("static_call_operator_const")
+
+#if __cplusplus >= 202301L && defined(__cpp_static_call_operator)
+#define static_call_operator static
+#define static_call_operator_const
+#else
+#define static_call_operator
+#define static_call_operator_const const
+#endif
+

fixed_lib/include/fixedmath/detail/type_traits.h

@@ -9,7 +9,6 @@
 #include <type_traits>
 #include <limits>
 #include <cmath>
-#include "utility_cxx20.h"
 
 namespace fixedmath::inline v2
   {