Conversion to the cmake building system. #2
Merged
MicheleC
merged 1 commits from feat/cmakeConv
into master
4 years ago
Loading…
Reference in new issue
There is no content yet.
Delete Branch 'feat/cmakeConv'
Deleting a branch is permanent. It CANNOT be undone. Continue?
Made on the "go" since I couldn't build It with scons.
WIP:Conversion to the cmake buildidng system.to WIP:Conversion to the cmake building system. 4 years agoWIP:Conversion to the cmake building system.to Conversion to the cmake building system. 4 years ago@SlavekB The differences with the Deb package is you have two desktop files:
one in, /opt/trinity/share/applications/kstreamripper.desktop
the other in, /opt/trinity/share/applications/tde/kstreamripper.desktop.
I've only installed the one in ../share/applications/tde/kstreamripper.desktop
Then you added a pixmap icon (Ubuntu stuff I believe).
I added a man page taken from your Deb packaging.
I tested in debian/bullseye using this PR and PR #1 (python3 fix) and it works fine.
Hi Greg,
as commented in #1, scons is causing dependency issues, since it requires different python versions between old and new distros (py2 and py3). Would you be able to rework this PR to totally drop scons and only use cmake?
For info, using this PR only (without #1) FTBFS in bullseye, for the same reasons explained in #1 (different python version.
@MicheleC unless I've missed something (just waking up here) the cmake conversion does not use anything from Scons or the Python interpreter.
I tried building kstreamripper using the cmake conversion on top of master and still fails here. I will double check just in case I made a mistake
The PR works fine after adjusting the packaging files on the packaging repo (TDE/tde-packaging#64).
I removed a few unnecessary files.
Once we get rid of automake files, we can also get rid of SCons files too.
Thanks Greg, excellent job as usual!
3db0e4b4ea
.