diff --git a/debian/rules b/debian/rules index 7a578567a..7cf1f90c6 100755 --- a/debian/rules +++ b/debian/rules @@ -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}') diff --git a/tests/panels/dock/taskmanager/CMakeLists.txt b/tests/panels/dock/taskmanager/CMakeLists.txt index b3e704916..57a5bfbd0 100644 --- a/tests/panels/dock/taskmanager/CMakeLists.txt +++ b/tests/panels/dock/taskmanager/CMakeLists.txt @@ -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 @@ -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/ @@ -29,6 +31,8 @@ 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 ) @@ -36,8 +40,9 @@ 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/