Merge branch 'variar:master' into ansi

Author: nowhszh

.clang-format

@@ -5,14 +5,12 @@ BreakBeforeBinaryOperators: true
 ColumnLimit: 100
 Standard: c++17
 IndentWidth: 4
-BreakBeforeBraces: Linux
 
 # Glogg-specific options
 PointerAlignment: Left
 SpacesInParentheses: true
 SpacesInSquareBrackets: true
 # DerivePointerAlignment: true
-AccessModifierOffset: -2
 
 BreakBeforeBraces: Custom
 BraceWrapping:

.github/actions/klogg-version/action.yml

@@ -6,4 +6,4 @@ runs:
     - name: Set klogg version
       shell: sh
       run: |
-        echo "KLOGG_VERSION=23.07.0.$((${{ github.run_number }} + 717))" >> $GITHUB_ENV 
+        echo "KLOGG_VERSION=23.08.0.$((${{ github.run_number }} + 717))" >> $GITHUB_ENV 

.gitignore

@@ -35,6 +35,7 @@ object_script.glogg.Release
 build_root/
 build_root_clang/
 build_root_gcc/
+build_root_qt5/
 build_root_qt6/
 test_data/
 

3rdparty/CMakeLists.txt

@@ -346,6 +346,46 @@ endif()
 
 set(CPM_USE_LOCAL_PACKAGES ${_TMP_CPM_USE_LOCAL_PACKAGES})
 
+if(KLOGG_USE_SENTRY)
+  set(SENTRY_BACKEND
+     "crashpad"
+     CACHE INTERNAL "" FORCE
+  )
+  set(SENTRY_TRANSPORT
+     "none"
+     CACHE INTERNAL "" FORCE
+  )
+  set(SENTRY_BUILD_EXAMPLES
+     OFF
+     CACHE INTERNAL "" FORCE
+  )
+  set(CRASHPAD_ENABLE_INSTALL
+     OFF
+     CACHE INTERNAL "" FORCE
+  )
+  set(CRASHPAD_ENABLE_INSTALL_DEV
+     OFF
+     CACHE INTERNAL "" FORCE
+  )
+
+  cpmaddpackage(
+    NAME
+    sentry
+    GITHUB_REPOSITORY
+    getsentry/sentry-native
+    GIT_TAG
+    79899a808a4675a66db6b76a144cecea954506ea
+    EXCLUDE_FROM_ALL
+    YES
+  )
+
+  if(WIN32)
+    set_target_properties(crashpad_handler PROPERTIES OUTPUT_NAME "klogg_crashpad_handler.exe")
+  else()
+    set_target_properties(crashpad_handler PROPERTIES OUTPUT_NAME "klogg_crashpad_handler")
+  endif()
+endif(KLOGG_USE_SENTRY)
+
 set(klogg_cpm_targets
     xxhash
     Catch2
@@ -359,9 +399,14 @@ set(klogg_cpm_targets
     SingleApplication
     hs
     tbb
-    exprtk,
-    type_safe,
+    exprtk
+    type_safe
     mimalloc-static
+    sentry
+    crashpad_client
+    crashpad_compat
+    crashpad_util
+    mini_chromium
 )
 foreach(target ${klogg_cpm_targets})
   if(TARGET ${target})
@@ -375,26 +420,4 @@ foreach(target ${klogg_cpm_targets})
   endif()
 endforeach()
 
-if(KLOGG_USE_SENTRY)
-  set(SENTRY_BACKEND
-      "crashpad"
-      CACHE INTERNAL "" FORCE
-  )
-  set(SENTRY_TRANSPORT
-      "none"
-      CACHE INTERNAL "" FORCE
-  )
-  set(SENTRY_BUILD_EXAMPLES
-      OFF
-      CACHE INTERNAL "" FORCE
-  )
-  set(CRASHPAD_ENABLE_INSTALL
-      OFF
-      CACHE INTERNAL "" FORCE
-  )
-  set(CRASHPAD_ENABLE_INSTALL_DEV
-      OFF
-      CACHE INTERNAL "" FORCE
-  )
-  add_subdirectory(sentry)
-endif(KLOGG_USE_SENTRY)
+