diff --git a/CMakeLists.txt b/CMakeLists.txt index 25087b61..5efd5f2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13) # 项目基本信息 project(deepin-reader - VERSION 1.0.0 + VERSION ${VERSION} DESCRIPTION "Deepin Document Viewer" LANGUAGES CXX C ) diff --git a/batch-print/CMakeLists.txt b/batch-print/CMakeLists.txt index 33d91945..ca321439 100644 --- a/batch-print/CMakeLists.txt +++ b/batch-print/CMakeLists.txt @@ -77,7 +77,7 @@ target_include_directories(batchprint-convert PUBLIC target_compile_definitions(batchprint-convert PRIVATE INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" INSTALL_LIBDIR="${CMAKE_INSTALL_LIBDIR}" - APP_VERSION="1.0.0" + APP_VERSION="${VERSION}" ) target_link_libraries(batchprint-convert PUBLIC diff --git a/linglong.yaml b/linglong.yaml index 6eb1e935..eeed0bd8 100644 --- a/linglong.yaml +++ b/linglong.yaml @@ -73,6 +73,7 @@ build: | # pkg-config 探测的第三方 -dev 库由 buildext.apt.build_depends 安装到 /usr; # 显式补充 PKG_CONFIG_PATH,确保 /usr 与 $PREFIX 下的 .pc 无论环境默认值如何均可见。 export PKG_CONFIG_PATH="${PREFIX}/lib/${TRIPLET}/pkgconfig:/usr/lib/${TRIPLET}/pkgconfig:/usr/share/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" + VERSION=$(head -1 debian/changelog | awk -F'[()]' '{print $2}') rm -rf build && mkdir -p build && cd build cmake .. \ -DCMAKE_BUILD_TYPE=Release \ @@ -81,7 +82,8 @@ build: | -DCMAKE_PREFIX_PATH="${PREFIX};/runtime" \ -DROFD_ROOT=${PREFIX} \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,-rpath-link,${PREFIX}/lib/${TRIPLET}:/runtime/lib/${TRIPLET}:/runtime/lib" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-rpath-link,${PREFIX}/lib/${TRIPLET}:/runtime/lib/${TRIPLET}:/runtime/lib" + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-rpath-link,${PREFIX}/lib/${TRIPLET}:/runtime/lib/${TRIPLET}:/runtime/lib" \ + -DVERSION=${VERSION} make -j$(nproc) make install > ../install.log 2>&1 diff --git a/reader/CMakeLists.txt b/reader/CMakeLists.txt index b918d89c..5fca11a3 100644 --- a/reader/CMakeLists.txt +++ b/reader/CMakeLists.txt @@ -109,7 +109,7 @@ if(NOT QT_VERSION_MAJOR MATCHES 6) endif() if (NOT APP_VERSION) - set(APP_VERSION "1.0.0") + set(APP_VERSION "${VERSION}") endif() # 定义安装前缀