Skip to content

Commit

Permalink
chore: tidyup project
Browse files Browse the repository at this point in the history
not compile reset-password-dialog, it is not used anymore, and delete
it, for it is only only for uos

use GNUInstallDirs

Log:
  • Loading branch information
Decodetalkers committed Jan 9, 2024
1 parent 51cd60a commit 94ad7a3
Show file tree
Hide file tree
Showing 37 changed files with 22 additions and 2,216 deletions.
8 changes: 5 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX /usr)
endif ()

include(GNUInstallDirs)

if (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug"))
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Ofast")

Expand All @@ -38,6 +40,8 @@ if (NOT (${CMAKE_BUILD_TYPE} MATCHES "Debug"))
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
endif ()

set(DAEMON_LIB_PATH CACHE STRING "lib/deepin-daemon")

# 查找gmock的cmake文件
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)

Expand Down Expand Up @@ -88,10 +92,8 @@ add_subdirectory("dde-wm-chooser")
# add_subdirectory("dmemory-warning-dialog")

add_subdirectory("dnetwork-secret-dialog")
#TODO 需要break旧版本的控制中心
add_subdirectory("reset-password-dialog")

#----------------------------install config------------------------------
## qm files
file(GLOB QM_FILES "translations/*.qm")
install(FILES ${QM_FILES} DESTINATION share/${PROJECT_NAME}/translations)
install(FILES ${QM_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/translations)
2 changes: 1 addition & 1 deletion dde-bluetooth-dialog/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ target_link_libraries(${Bluetooth_Dialog_Name} PRIVATE
)

## bin
install(TARGETS ${Bluetooth_Dialog_Name} DESTINATION lib/deepin-daemon)
install(TARGETS ${Bluetooth_Dialog_Name} DESTINATION ${DAEMON_LIB_PATH})
2 changes: 1 addition & 1 deletion dde-hints-dialog/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ target_link_libraries(${Hints_Dialog_Name} PRIVATE
)

## bin
install(TARGETS ${Hints_Dialog_Name} DESTINATION bin)
install(TARGETS ${Hints_Dialog_Name} DESTINATION ${CMAKE_INSTALL_BINDIR})
2 changes: 1 addition & 1 deletion dde-license-dialog/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ target_link_libraries(${License_Dialog_Name} PRIVATE
)

## bin
install(TARGETS ${License_Dialog_Name} DESTINATION bin)
install(TARGETS ${License_Dialog_Name} DESTINATION ${CMAKE_INSTALL_BINDIR})
2 changes: 1 addition & 1 deletion dde-lowpower/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ target_link_libraries(${Lowpower_Name} PRIVATE
)

## bin
install(TARGETS ${Lowpower_Name} DESTINATION lib/deepin-daemon)
install(TARGETS ${Lowpower_Name} DESTINATION ${DAEMON_LIB_PATH})
4 changes: 2 additions & 2 deletions dde-osd/src/notification-center/overlapwidet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ void HalfRoundedRectWidget::paintEvent(QPaintEvent *event)

QPainterPath path;
path.moveTo(rect.bottomRight() - QPointF(0, radius));
path.lineTo(rect.topRight().x(), rect.topRight().y() / 2);
path.lineTo(rect.topLeft().x(), rect.topLeft().y() / 2);
path.lineTo(rect.topRight().x(), rect.topRight().y() / 2.0);
path.lineTo(rect.topLeft().x(), rect.topLeft().y() / 2.0);
path.lineTo(rect.bottomLeft() - QPointF(0, radius));
path.arcTo(QRectF(QPointF(rect.bottomLeft() - QPointF(0, radius * 2)), QSize(radius * 2, radius * 2)), 180, 90);
path.lineTo(rect.bottomRight() + QPointF(radius, 0));
Expand Down
2 changes: 1 addition & 1 deletion dde-pixmix/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ target_link_libraries(${Pixmix_Name} PRIVATE
)

## bin
install(TARGETS ${Pixmix_Name} DESTINATION bin)
install(TARGETS ${Pixmix_Name} DESTINATION ${DAEMON_LIB_PATH})
4 changes: 2 additions & 2 deletions dde-suspend-dialog/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ target_link_libraries(${Suspend_Dialog_Name} PRIVATE
)

## bin
install(TARGETS ${Suspend_Dialog_Name} DESTINATION lib/deepin-daemon)
install(TARGETS ${Suspend_Dialog_Name} DESTINATION ${DAEMON_LIB_PATH})

## icons
install(FILES data/computer.svg DESTINATION share/icons/hicolor/scalable/devices)
install(FILES data/computer.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/devices)
2 changes: 1 addition & 1 deletion dde-switchtogreeter/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ target_link_libraries(${Switchtogreeter_Name} PRIVATE
)

## bin
install(TARGETS ${Switchtogreeter_Name} DESTINATION bin)
install(TARGETS ${Switchtogreeter_Name} DESTINATION ${DAEMON_LIB_PATH})
2 changes: 1 addition & 1 deletion dde-touchscreen-dialog/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ target_link_libraries(${Touchscreen_Dialog_Name} PRIVATE
)

## bin
install(TARGETS ${Touchscreen_Dialog_Name} DESTINATION lib/deepin-daemon)
install(TARGETS ${Touchscreen_Dialog_Name} DESTINATION ${DAEMON_LIB_PATH})
4 changes: 2 additions & 2 deletions dde-warning-dialog/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ target_link_libraries(${Warning_Dialog_Name} PRIVATE
)

## bin
install(TARGETS ${Warning_Dialog_Name} DESTINATION lib/deepin-daemon)
install(TARGETS ${Warning_Dialog_Name} DESTINATION ${DAEMON_LIB_PATH})

## service
install(FILES org.deepin.dde.WarningDialog1.service DESTINATION share/dbus-1/services)
install(FILES org.deepin.dde.WarningDialog1.service DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services)
4 changes: 2 additions & 2 deletions dde-welcome/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ PRIVATE
)

## bin
install(TARGETS ${Welcome_Name} DESTINATION lib/deepin-daemon)
install(TARGETS ${Welcome_Name} DESTINATION ${DAEMON_LIB_PATH})

## service
install(FILES org.deepin.dde.Welcome1.service DESTINATION share/dbus-1/services)
install(FILES org.deepin.dde.Welcome1.service DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services)
2 changes: 1 addition & 1 deletion dde-wm-chooser/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ target_link_libraries(${Wm_Chooser_Name} PRIVATE
)

## bin
install(TARGETS ${Wm_Chooser_Name} DESTINATION bin)
install(TARGETS ${Wm_Chooser_Name} DESTINATION ${CMAKE_INSTALL_BINDIR})
2 changes: 1 addition & 1 deletion dnetwork-secret-dialog/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ target_link_libraries(${Dnetwork_Secret_Dialog_Name} PRIVATE
)

## bin
install(TARGETS ${Dnetwork_Secret_Dialog_Name} DESTINATION lib/deepin-daemon)
install(TARGETS ${Dnetwork_Secret_Dialog_Name} DESTINATION ${DAEMON_LIB_PATH})
91 changes: 0 additions & 91 deletions reset-password-dialog/CMakeLists.txt

This file was deleted.

21 changes: 0 additions & 21 deletions reset-password-dialog/icons/dcc_deepin_password_strength_high.svg

This file was deleted.

23 changes: 0 additions & 23 deletions reset-password-dialog/icons/dcc_deepin_password_strength_low.svg

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

10 changes: 0 additions & 10 deletions reset-password-dialog/icons/unbind_dark.svg

This file was deleted.

14 changes: 0 additions & 14 deletions reset-password-dialog/icons/unbind_light.svg

This file was deleted.

Loading

0 comments on commit 94ad7a3

Please sign in to comment.