Merge branch 'master' of gitlab.acadiasoft.net:qs/ore

Author: pcaspers

App/ore.cpp

@@ -27,7 +27,7 @@
 
 #include <orea/app/oreapp.hpp>
 
-#include <ored/utilities/initbuilders.hpp>
+#include <orea/app/initbuilders.hpp>
 
 #include <qle/version.hpp>
 
@@ -71,7 +71,7 @@ int main(int argc, char** argv) {
         return -1;
     }
 
-    ore::data::initBuilders();
+    ore::analytics::initBuilders();
 
     string inputFile(argv[1]);
 

CMakePresets.json

@@ -186,6 +186,20 @@
         "rhs": "Linux"
       }
     },
+    {
+      "name": "apple-arm64-base",
+      "hidden": true,
+      "binaryDir": "${sourceDir}/build/${presetName}",
+      "architecture": {
+        "value": "arm64",
+        "strategy": "external"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      }
+    },
     {
       "name": "_release",
       "hidden": true,
@@ -204,7 +218,7 @@
       "name": "_relwithdebinfo",
       "hidden": true,
       "cacheVariables": {
-          "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo"
       }
     },
     {
@@ -288,6 +302,33 @@
         "_ninja",
         "_relwithdebinfo"
       ]
+    },
+    {
+      "name": "apple-arm64-ninja-debug",
+      "description": "Apple M series preset Debug",
+      "inherits": [
+        "apple-arm64-base",
+        "_ninja",
+        "_debug"
+      ]
+    },
+    {
+      "name": "apple-arm64-ninja-release",
+      "description": "Apple M series preset Release",
+      "inherits": [
+        "apple-arm64-base",
+        "_ninja",
+        "_release"
+      ]
+    },
+    {
+      "name": "apple-arm64-ninja-relwithdebinfo",
+      "description": "Apple M series preset RelWithDebInfo",
+      "inherits": [
+        "apple-arm64-base",
+        "_ninja",
+        "_relwithdebinfo"
+      ]
     }
   ],
   "buildPresets": [

Docker/.env

@@ -3,7 +3,7 @@ DEBIAN_TAG=11.7
 # it's recommended to include CMAKE_BUILD_TYPE and BOOST_VARIANT in QL_TAG, ORE_TAG, BOOST_TAG
 # to distinguish a release build from a debug build
 
-QL_TAG=1.31.1_ddda9430
+QL_TAG=1.31.1_f8955cf0
 ORE_TAG=latest
 
 # debug or release