TDE
/
smb4k
6
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
Labels Milestones

CMake conversion #13

Merged
MicheleC merged 2 commits from feat/cmake-conversion into master 6 months ago
Conversation 1 Commits 2 Files Changed 49
MicheleC commented 6 months ago
Owner

As per title.

On deb distros, to be built with TDE/tde-packaging#261.

As per title. On deb distros, to be built with TDE/tde-packaging#261.
MicheleC added this to the R14.1.2 release milestone 6 months ago
MicheleC added 2 commits 6 months ago
43c7061c61
TQString related changes required for cmake conversion
5852e9af4c
CMake conversion
MicheleC requested review from Core 6 months ago
MicheleC requested review from Owners 6 months ago
MicheleC force-pushed feat/cmake-conversion from 5852e9af4c to b853675723 6 months ago
MicheleC force-pushed feat/cmake-conversion from b853675723 to be31f778a9 6 months ago
SlavekB requested changes 6 months ago
SlavekB left a comment
Owner

I haven't done a test for now, but there are some small things to change.

I haven't done a test for now, but there are some small things to change.
plugin/CMakeLists.txt
SOURCES smb4k_konqplugin.cpp
LINK tdecore-shared tdeui-shared tdeio-shared tdeparts-shared konqsidebarplugin-shared smb4kcore-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
SlavekB commented 6 months ago
Owner

Forgotten unnecessary blank line.

Forgotten unnecessary blank line.
MicheleC marked this conversation as resolved
plugin/CMakeLists.txt
tde_create_translated_desktop(
SOURCE smb4k_add.desktop
DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add
SlavekB commented 6 months ago
Owner

Unexpected indentation.

Unexpected indentation.
MicheleC marked this conversation as resolved
smb4k/core/CMakeLists.txt
smb4kprint.h smb4kprintinfo.h smb4ksambaoptionshandler.h
smb4ksambaoptionsinfo.h smb4kscanner.h smb4kshare.h
smb4ksynchronizationinfo.h smb4ksynchronizer.h
DESTINATION ${INCLUDE_INSTALL_DIR}/tde
SlavekB commented 6 months ago
Owner

Headers should be installed in ${INCLUDE_INSTALL_DIR}. Adding the tde subfolder is a relic of automake builds. If in the future we want to install, for example, in /usr/include/tde, then this path will be set to ${INCLUDE_INSTALL_DIR}.

Headers should be installed in `${INCLUDE_INSTALL_DIR}`. Adding the `tde` subfolder is a relic of automake builds. If in the future we want to install, for example, in `/usr/include/tde`, then this path will be set to `${INCLUDE_INSTALL_DIR}`.
MicheleC commented 6 months ago
Poster
Owner

I also agree that the tde location looks weird. I added it to mirror the current automake build structure, but happy to simply use ${INCLUDE_INSTALL_DIR}

I also agree that the `tde` location looks weird. I added it to mirror the current automake build structure, but happy to simply use `${INCLUDE_INSTALL_DIR}`
MicheleC marked this conversation as resolved
smb4k/icons/CMakeLists.txt
# cr16-app-smb4k.png cr32-app-smb4k.png cr48-app-smb4k.png cr64-app-smb4k.png
# DESTINATION
# ${DATA_INSTALL_DIR}/soundkonverter/pics
#)
SlavekB commented 6 months ago
Owner

Probably forgotten code from past several conversions.

Probably forgotten code from past several conversions.
MicheleC commented 6 months ago
Poster
Owner

yeah 😄

yeah 😄
MicheleC marked this conversation as resolved
MicheleC force-pushed feat/cmake-conversion from be31f778a9 to 5bbf721612 6 months ago
MicheleC commented 6 months ago
Poster
Owner

PR updated based on comments.

PR updated based on comments.
MicheleC requested review from SlavekB 6 months ago
SlavekB approved these changes 6 months ago
SlavekB left a comment
Owner

All looks good.

All looks good.
MicheleC merged commit 5bbf721612 into master 6 months ago
MicheleC deleted branch feat/cmake-conversion 6 months ago

Reviewers

SlavekB approved these changes 6 months ago
TDE/Core was requested for review 6 months ago
The pull request has been merged as 5bbf721612.
Sign in to join this conversation.
Reviewers
Request review
No reviewers
SlavekB
TDE/Core
Labels
Apply labels
Clear labels
GE/need-info
General - need additional info from contributor PR/keep-branch
Pull request - do not delete branch after merging PR/not-ok
Pull request - need fixing PR/rfc
Pull request - request for comments PR/update-trans
Pull request - update to translation files needed PR/wip
Pull request - work in progress RS/R14.0.x
Related to R14.0.x series RS/R14.1.x
Related to R14.1.x series SL/critical
Severity level - critical SL/major
Severity level - major SL/minor
Severity level - minor SL/normal
Severity level - normal SL/regression
Severity level - regression from previous version SL/trivial
Severity level - trivial SL/wishlist
Severity level - wishlist request ST/duplicate
Status - duplicate of another issue ST/invalid
Status - invalid report ST/notourproblem
Status - not our problem ST/rejected
Status - rejected ST/wontfix
Status - won't fix ST/worksforme
Status - works for me, unable to reproduce
No Label GE/need-info PR/keep-branch PR/not-ok PR/rfc PR/update-trans PR/wip RS/R14.0.x RS/R14.1.x SL/critical SL/major SL/minor SL/normal SL/regression SL/trivial SL/wishlist ST/duplicate ST/invalid ST/notourproblem ST/rejected ST/wontfix ST/worksforme
Milestone
Set milestone
Clear milestone
No items
No Milestone
R14.1.2 release
Assignees
Assign users
Clear assignees
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/smb4k#13
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'feat/cmake-conversion'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes