!30 修复CMake target name 为test导致的编译问题

From: @liubuguiii 
Reviewed-by: @stonefly128 
Signed-off-by: @stonefly128
This commit is contained in:
openeuler-ci-bot 2023-09-04 07:03:57 +00:00 committed by Gitee
commit ac7d2bb405
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 79 additions and 1 deletions

View File

@ -0,0 +1,74 @@
From 7082e9f88b6d70afbb63fea8f97ecc7c2ef47347 Mon Sep 17 00:00:00 2001
From: liuxinhao <liuxinhao@kylinsec.com.cn>
Date: Mon, 4 Sep 2023 13:25:50 +0800
Subject: [PATCH] fix(cmake target): change cmake target name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 修改CMake target name 为test导致的编译问题
---
CMakeLists.txt | 2 +-
{test => integration-test}/CMakeLists.txt | 2 +-
{test => integration-test}/src/main.cpp | 0
{test => integration-test}/src/qt-widget-factor.cpp | 0
{test => integration-test}/src/qt-widget-factor.h | 0
{test => integration-test}/src/qt-widget-factor.ui | 0
{test => integration-test}/src/test.ui | 0
7 files changed, 2 insertions(+), 2 deletions(-)
rename {test => integration-test}/CMakeLists.txt (97%)
rename {test => integration-test}/src/main.cpp (100%)
rename {test => integration-test}/src/qt-widget-factor.cpp (100%)
rename {test => integration-test}/src/qt-widget-factor.h (100%)
rename {test => integration-test}/src/qt-widget-factor.ui (100%)
rename {test => integration-test}/src/test.ui (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf571f2..3b7eafc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,4 +17,4 @@ add_subdirectory(platformtheme)
add_subdirectory(style-helper)
#QStyle插件
add_subdirectory(style)
-add_subdirectory(test)
\ No newline at end of file
+#add_subdirectory(integration-test)
diff --git a/test/CMakeLists.txt b/integration-test/CMakeLists.txt
similarity index 97%
rename from test/CMakeLists.txt
rename to integration-test/CMakeLists.txt
index bc286f3..c757e4f 100644
--- a/test/CMakeLists.txt
+++ b/integration-test/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.5)
-project(test)
+project(integration-test)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/test/src/main.cpp b/integration-test/src/main.cpp
similarity index 100%
rename from test/src/main.cpp
rename to integration-test/src/main.cpp
diff --git a/test/src/qt-widget-factor.cpp b/integration-test/src/qt-widget-factor.cpp
similarity index 100%
rename from test/src/qt-widget-factor.cpp
rename to integration-test/src/qt-widget-factor.cpp
diff --git a/test/src/qt-widget-factor.h b/integration-test/src/qt-widget-factor.h
similarity index 100%
rename from test/src/qt-widget-factor.h
rename to integration-test/src/qt-widget-factor.h
diff --git a/test/src/qt-widget-factor.ui b/integration-test/src/qt-widget-factor.ui
similarity index 100%
rename from test/src/qt-widget-factor.ui
rename to integration-test/src/qt-widget-factor.ui
diff --git a/test/src/test.ui b/integration-test/src/test.ui
similarity index 100%
rename from test/src/test.ui
rename to integration-test/src/test.ui
--
2.33.0

View File

@ -1,6 +1,6 @@
Name: kiran-qt5-integration
Version: 2.4.0
Release: 10
Release: 11
Summary: Kiran desktop platform integration plugin.
License: MulanPSL-2.0
@ -13,6 +13,7 @@ Patch0004: 0004-feat-style-app-Adjust-the-topic-configuration-to-whi.patch
Patch0005: 0005-fix-style-add-ksl-os-gui-to-the-Style-whitelist.patch
Patch0006: 0006-feat-cursor-theme-When-the-cursor-theme-changes-let-.patch
Patch0007: 0007-fix-style-add-ksl-server-gui-and-ks-scmc-gui-to-kira.patch
Patch0008: 0008-fix-cmake-target-change-cmake-target-name.patch
BuildRequires: cmake >= 3.2
BuildRequires: gcc-c++
@ -68,6 +69,9 @@ make %{?_smp_mflags}
%{_libdir}/pkgconfig/kiran-style-helper.pc
%changelog
* Mon Sep 04 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.4.0-11
- KYOS-F: fix cmake target name test cause build error.
* Fri Aug 11 2023 liuxinhao <liuxinhao@kylinsec.com.cn> - 2.4.0-10
- KYOS-F: add ksl-server-gui and ks-scmc-gui to kiran-style-apps