mandlm/ESGRAF48
1
0
Fork 0
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: mandlm:main
Branches Tags
mandlm:main
mandlm:develop
mandlm:feature/test-load
mandlm:feature/integrate-clang-tidy
mandlm:feature/qt-as-conan-package
mandlm:feature/print-as-qtextdocument
mandlm:feature/print-with-inja
mandlm:feature/build-protobuf
..
compare: mandlm:feature/qt-as-conan-package
Branches Tags
mandlm:develop
mandlm:feature/test-load
mandlm:feature/integrate-clang-tidy
mandlm:main
mandlm:feature/qt-as-conan-package
mandlm:feature/print-as-qtextdocument
mandlm:feature/print-with-inja
mandlm:feature/build-protobuf

No commits in common. "main" and "feature/qt-as-conan-package" have entirely different histories.
main ... feature/qt

2 changed files with 1 additions and 2 deletions
Show stats Expand all files Collapse all files

1
conanfile.txt
View file

@ -10,4 +10,3 @@ cmake
[options] [options]
protobuf:shared=False protobuf:shared=False
qt:qttools=True qt:qttools=True
qt:qttranslations=True

2
source/CMakeLists.txt
View file

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.6)
set(BUILD_VERSION_MAJOR_MINOR 0.6) set(BUILD_VERSION_MAJOR_MINOR 0.5)
if ($ENV{BUILD_NUMBER}) if ($ENV{BUILD_NUMBER})
set(BUILD_VERSION_PATCH $ENV{BUILD_NUMBER}) set(BUILD_VERSION_PATCH $ENV{BUILD_NUMBER})