Skip to content

Commit 54c5f68

Browse files
authored
Merge pull request #30 from gmrandazzo/develop
New release 2.5.0
2 parents 158c384 + f22ca85 commit 54c5f68

198 files changed

Lines changed: 9521 additions & 230611 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/codeql.yml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,19 @@ jobs:
4343
# queries: security-extended,security-and-quality
4444

4545
- name: Install Dependencies
46-
4746
run: |
48-
sudo apt-get update
49-
sudo apt-get -y full-upgrade
50-
sudo apt-get -y install \
51-
cmake \
52-
build-essential \
53-
qt6-base-dev \
54-
libqt6core5compat6-dev \
55-
libqt6charts6-dev \
56-
libglx-dev \
57-
libgl1-mesa-dev \
58-
libglvnd-dev \
59-
git
47+
sudo apt-get update
48+
sudo apt-get install -y \
49+
build-essential \
50+
cmake \
51+
qt6-base-dev \
52+
libqt6charts6-dev \
53+
libqt6core5compat6-dev \
54+
libgl1-mesa-dev \
55+
libglu1-mesa-dev \
56+
git \
57+
liblapack-dev \
58+
libblas-dev
6059
6160
# Create a build directory
6261
- name: Create build directory

.github/workflows/cppcheck.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Cppcheck Analysis
2+
3+
on:
4+
pull_request:
5+
branches: [ main, master, develop ]
6+
push:
7+
branches: [ main, master, develop ]
8+
9+
jobs:
10+
cppcheck:
11+
name: Run cppcheck
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v4
16+
17+
- name: Install cppcheck
18+
run: sudo apt-get update && sudo apt-get install -y cppcheck
19+
20+
- name: Run cppcheck
21+
run: |
22+
cppcheck --enable=all \
23+
--checkers-report=report.txt \
24+
--check-level=exhaustive \
25+
--suppress=missingIncludeSystem \
26+
--suppress=unusedFunction \
27+
--suppress=missingInclude \
28+
--suppress=unknownMacro \
29+
--error-exitcode=1 \
30+
src
31+
32+
- name: Upload report
33+
if: always()
34+
uses: actions/upload-artifact@v4
35+
with:
36+
name: cppcheck-report
37+
path: report.txt

.github/workflows/semgrep.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Semgrep
2+
3+
on:
4+
push:
5+
branches: ["master"]
6+
pull_request:
7+
branches: ["master"]
8+
schedule:
9+
- cron: '0 0 * * *'
10+
11+
jobs:
12+
semgrep:
13+
name: Scan
14+
runs-on: ubuntu-latest
15+
container:
16+
image: returntocorp/semgrep
17+
steps:
18+
- name: Checkout repository
19+
uses: actions/checkout@v4
20+
21+
- name: Semgrep Scan
22+
run: semgrep ci
23+
env:
24+
SEMGREP_RULES: p/default

.github/workflows/sonarqube.yml

Lines changed: 0 additions & 84 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Directory
2+
_build/
3+
_build/*
24
build/
35
build/*
46
.kdev4

.gitlab-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
stages:
3+
- test
4+
5+
semgrep:
6+
stage: test
7+
image: returntocorp/semgrep
8+
variables:
9+
SEMGREP_RULES: p/default # scan with default rules
10+
script:
11+
- semgrep ci
12+
rules:
13+
- if: $CI_PIPELINE_SOURCE == "push"
14+
- if: $CI_PIPELINE_SOURCE == "pull_request"

CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
project(QStudioMetrics)
21
cmake_minimum_required(VERSION 3.22)
3-
set(VERSION "2.3.0")
2+
project(QStudioMetrics)
3+
set(VERSION "2.5.0")
44
set(AUTHOR "Giuseppe Marco Randazzo")
55
set(CMAKE_AUTOMOC OFF)
66
set(CMAKE_AUTOUIC ON)
@@ -47,13 +47,16 @@ endforeach()
4747
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
4848
find_package(libscientific)
4949

50-
if(NOT ${LIBSCIENTIFIC_FOUND})
50+
set(LIBSCIENTIFIC_DEPENDENCY "")
51+
if(NOT LIBSCIENTIFIC_FOUND)
5152
message(STATUS "Cloning libscientific")
5253
include(ExternalProject)
5354
set(EXTERNAL_INSTALL_LOCATION ${CMAKE_BINARY_DIR}/external)
55+
file(MAKE_DIRECTORY ${EXTERNAL_INSTALL_LOCATION}/include)
5456
ExternalProject_Add(libscientific_git
5557
GIT_REPOSITORY https://github.com/gmrandazzo/libscientific
5658
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION})
59+
set(LIBSCIENTIFIC_DEPENDENCY libscientific_git)
5760
include_directories(${EXTERNAL_INSTALL_LOCATION}/include)
5861
link_directories(${EXTERNAL_INSTALL_LOCATION}/lib)
5962
if(WIN32)

0 commit comments

Comments
 (0)