mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-04-02 15:33:46 +03:00
Code

updated CMAKELIST

Browse Source
This commit is contained in:
yanis60 2024-06-22 13:56:10 +01:00 committed by GitHub
parent 67a8907e3a
commit 5bca855318
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"githubPullRequests.ignoredPullRequestBranches": [
"master"
]
}

5
CMakeLists.txt
View File

@ -2,10 +2,7 @@ cmake_minimum_required(VERSION 3.14)
project(limereport) project(limereport)
set(LIMEREPORT_VERSION_MAJOR 1) set(LIMEREPORT_VERSION_MAJOR 1)
<<<<<<< HEAD
set(LIMEREPORT_VERSION_MINOR 6)
set(LIMEREPORT_VERSION_RELEASE 8)
=======
set(LIMEREPORT_VERSION_MINOR 7) set(LIMEREPORT_VERSION_MINOR 7)
set(LIMEREPORT_VERSION_RELEASE 7) set(LIMEREPORT_VERSION_RELEASE 7)
>>>>>>> b4b2da83307b17610728ba18fba062abc897edc0 >>>>>>> b4b2da83307b17610728ba18fba062abc897edc0