Skip to content

Revert "fix: 主要是处理打包单元测试报错问题。" #1368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
18202781743 merged 2 commits into from
Dec 15, 2025
Merged

Revert "fix: 主要是处理打包单元测试报错问题。" #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec528d9
Revert "fix: 主要是处理打包单元测试报错问题。"
18202781743 Dec 15, 2025
29c69fd
fix: update test CMakeLists for role models
18202781743 Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export DEB_CXXFLAGS_MAINT_APPEND = -Wall
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -Wl,-E

# reproducible编译参数
#DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_BUILD_RPATH=ON
DEB_CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_BUILD_RPATH=ON

VERSION = $(DEB_VERSION_UPSTREAM)
PACK_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}')
Expand Down
9 changes: 7 additions & 2 deletions tests/panels/dock/taskmanager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Co
include(GoogleTest)

add_executable(rolecombinemodel_tests
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/rolecombinemodel.h
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/rolecombinemodel.cpp
combinemodela.cpp
combinemodela.h
combinemodelb.cpp
Expand All @@ -19,8 +21,8 @@ target_link_libraries(rolecombinemodel_tests
GTest::GTest
GTest::Main
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Gui
Qt${QT_VERSION_MAJOR}::Test
dock-taskmanager
)
target_include_directories(rolecombinemodel_tests PRIVATE
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/
Expand All @@ -29,15 +31,18 @@ target_include_directories(rolecombinemodel_tests PRIVATE
gtest_discover_tests(rolecombinemodel_tests)

add_executable(rolegroupmodel_tests
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/rolegroupmodel.h
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/rolegroupmodel.cpp
rolegroupmodeltests.cpp
)

target_link_libraries(rolegroupmodel_tests
GTest::GTest
GTest::Main
Qt${QT_VERSION_MAJOR}::Core
Qt${QT_VERSION_MAJOR}::Gui
Qt${QT_VERSION_MAJOR}::Test
dock-taskmanager
# dock-taskmanager
)
target_include_directories(rolegroupmodel_tests PRIVATE
${CMAKE_SOURCE_DIR}/panels/dock/taskmanager/
Expand Down