From 1ce4745e6c22b1a99d3b0b1b83b7aa54348da9c1 Mon Sep 17 00:00:00 2001
From: dmitry <dmitry.puzyrkov@demlabs.net>
Date: Wed, 31 Jul 2024 14:49:00 +0700
Subject: [PATCH] ...
---
.gitlab-ci.yml | 103 -------------------------------------------------
CMakeLists.txt | 9 +++--
2 files changed, 6 insertions(+), 106 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c01cd61..e69de29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,103 +0,0 @@
-variables:
- GIT_SUBMODULE_STRATEGY: recursive
-
-stages:
- - build
- - deploy
- - publish
-.ci-polygon:
- tags:
- - ci-polygon
-
-.build:
- extends: .ci-polygon
- stage: build
- timeout: 3 hours 30 minutes
- dependencies: []
- artifacts:
- paths:
- - build_*/*.deb
-
-.deploy:
- extends: .ci-polygon
- image: demlabs/amd64/debian-buster:linuxbuilder
- stage: deploy
- before_script: /opt/buildtools/prepare_environment.sh
-
-.publish:
- extends: .deploy
- stage: publish
- allow_failure: true
-
-macos-amd64:
- extends: .build
- image: demlabs/amd64/debian-bullseye:osxbuilderssl
- before_script: /opt/buildtools/prepare_environment.sh amd64-osx
- script:
- - ./prod_build/build.sh --target osx release
- - ./prod_build/pack.sh --target osx release --sign /opt/buildtools/sign/macos/demlabs.sh
- artifacts:
- paths:
- - build_*/*.pkg
-
-linux-amd64-debian-buster:
- extends: .build
- image: demlabs/amd64/debian-buster:linuxbuilder
- before_script: /opt/buildtools/prepare_environment.sh amd64-linux
- script:
- - ./prod_build/build.sh --target linux release
- - ./prod_build/pack.sh --target linux release
- - anybadge -l "master version" -v "$(source version.mk; echo "$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH")" -f version-badge.svg -c blue
- - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-dashboard/$CI_COMMIT_REF_NAME/ ./version-badge.svg || true
-
-linux-arm64-debian-bullseye:
- extends: .build
- image: demlabs/arm64v8/debian-bullseye:linuxbuilder
- before_script: /opt/buildtools/prepare_environment.sh arm64-linux
- script:
- - ./prod_build/build.sh --target linux release
- - ./prod_build/pack.sh --target linux release
- - anybadge -l "master version" -v "$(source version.mk; echo "$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH")" -f version-badge.svg -c blue
- - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-dashboard/$CI_COMMIT_REF_NAME/ ./version-badge.svg || true
-
-
-
-windows-amd64:
- extends: .build
- image: demlabs/amd64/debian-bullseye:windowsbuilder
- before_script: /opt/buildtools/prepare_environment.sh amd64-linux
- script:
- - ./prod_build/build.sh --target windows release
- - ./prod_build/pack.sh --target windows release --sign /opt/buildtools/sign/windows/cellframe-dashboard.sh
- artifacts:
- paths:
- - build_*/*.exe
-
-
-deploy-linux:
- extends: .deploy
- needs:
- - linux-amd64-debian-buster
- - linux-arm64-debian-bullseye
-
-
- script:
- - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-dashboard/$CI_COMMIT_REF_NAME/ build_*/*.deb
-
-
-deploy-macos:
- extends: .deploy
- needs:
- - macos-amd64
-
- script:
- - /opt/buildtools/deploy_files.sh pub_cellframe macos/cellframe-dashboard/$CI_COMMIT_REF_NAME/ build_*/*.pkg
-
-deploy-windows:
- extends: .deploy
- needs:
- - windows-amd64
-
- script:
- - /opt/buildtools/deploy_files.sh pub_cellframe windows/cellframe-dashboard/$CI_COMMIT_REF_NAME/ build_*/*.exe
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef3d277..3ebf477 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,6 @@ find_package(Qt5 5.15 REQUIRED COMPONENTS
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
-
-
if(UNIX)
if(DARWIN)
add_definitions(-DCLI_PATH="./cellframe-node-cli")
@@ -66,6 +64,11 @@ target_include_directories(${PROJECT_NAME} PRIVATE ./CellframeNodeDiagtool)
target_include_directories(${PROJECT_NAME} PRIVATE ./CellframeNodeTray)
target_link_libraries(${PROJECT_NAME}
- Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::Qml Qt5::QuickWidgets
+ PUBLIC Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets Qt5::Qml Qt5::QuickWidgets
)
+if (WIN32)
+target_link_libraries(${PROJECT_NAME} PUBLIC psapi)
+endif()
+
+
--
GitLab