opengnsys
/
ogbrowser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix versioning some more

jenkins
Vadim vtroshchinskiy 2025-02-24 14:20:11 +01:00
parent 52a56aafc4
commit 2ff26a8eb5
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@ -46,8 +46,7 @@ pipeline {
sh ''' sh '''
mkdir -p build mkdir -p build
cd build cd build
export OGBROWSER_VERSION_PATCH="${BUILD_NUMBER}" cmake .. -DCPACK_PACKAGE_VERSION_PATCH=${BUILD_NUMBER} -G Ninja
cmake .. -G Ninja
ninja ninja
''' '''
} }

5
qtermwidget/CMakeLists.txt
View File

@ -53,7 +53,10 @@ else()
find_package(Qt5LinguistTools "${QT_MINIMUM_VERSION}" REQUIRED) find_package(Qt5LinguistTools "${QT_MINIMUM_VERSION}" REQUIRED)
endif() endif()
find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} QUIET)
if (NOT lxqt-build-tools_FOUND)
find_package(lxqt2-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
endif()
if(USE_UTF8PROC) if(USE_UTF8PROC)
find_package(Utf8Proc REQUIRED) find_package(Utf8Proc REQUIRED)

13
src/CMakeLists.txt
View File

@ -10,23 +10,18 @@ set(CMAKE_AUTORCC ON)
if (DEFINED $ENV{OGBROWSER_VERSION_MAJOR}) if (NOT DEFINED CPACK_PACKAGE_VERSION_MAJOR)
set(CPACK_PACKAGE_VERSION_MAJOR "$ENV{OGBROWSER_VERSION_MAJOR}")
else()
set(CPACK_PACKAGE_VERSION_MAJOR "2") set(CPACK_PACKAGE_VERSION_MAJOR "2")
endif() endif()
if (DEFINED $ENV{OGBROWSER_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_MINOR "$ENV{OGBROWSER_VERSION_MINOR}") if (NOT DEFINED CPACK_PACKAGE_VERSION_MINOR)
else()
set(CPACK_PACKAGE_VERSION_MINOR "0") set(CPACK_PACKAGE_VERSION_MINOR "0")
endif() endif()
if (DEFINED $ENV{OGBROWSER_VERSION_PATCH}) if (NOT DEFINED CPACK_PACKAGE_VERSION_PATCH)
set(CPACK_PACKAGE_VERSION_PATCH "$ENV{OGBROWSER_VERSION_PATCH}")
else()
set(CPACK_PACKAGE_VERSION_PATCH "0") set(CPACK_PACKAGE_VERSION_PATCH "0")
endif() endif()