Hi Slavek, you helped solving similar situation in tdelibs, perhaps you have some other great idea for following
When building amarok with -j4 it failed because not able to find amarokconfig.cpp (AFAIR)
Could be there some cmake magic you can apply?
regards
--------------------------------------------------------------------- To unsubscribe, e-mail: trinity-devel-unsubscribe@lists.pearsoncomputing.net For additional commands, e-mail: trinity-devel-help@lists.pearsoncomputing.net Read list messages on the web archive: http://trinity-devel.pearsoncomputing.net/ Please remember not to top-post: http://trinity.pearsoncomputing.net/mailing_lists/#top-posting
On Friday 29 of May 2020 14:19:41 deloptes wrote:
Hi Slavek, you helped solving similar situation in tdelibs, perhaps you have some other great idea for following
When building amarok with -j4 it failed because not able to find amarokconfig.cpp (AFAIR)
Could be there some cmake magic you can apply?
regards
Hi deloptes,
I assume that amarokconfig.h is missing, not amarokconfig.cpp. I looked at the dependencies and at first glance I see the missing "DEPENDENCIES amarokcore-static" in amarok/src/engine/xine/CMakeLists.txt. You can add this dependency on your machine and check if the build will be ok?
Cheers
Slávek Banko wrote:
DEPENDENCIES amarokcore-static
Thank you Slavek!
It was close enough to fix it - perhaps magnatunebrowser is build first. Should I create a PR?
$ git diff diff --git a/amarok/src/magnatunebrowser/CMakeLists.txt b/amarok/src/magnatunebrowser/CMakeLists.txt index 6ed7fe3..9345696 100644 --- a/amarok/src/magnatunebrowser/CMakeLists.txt +++ b/amarok/src/magnatunebrowser/CMakeLists.txt @@ -33,4 +33,5 @@ tde_add_library( magnatunebrowser STATIC_PIC AUTOMOC magnatunelistview.cpp magnatuneredownloaddialog.cpp magnatuneredownloadhandler.cpp magnatunedownloadinfo.cpp magnatunealbumdownloader.cpp magnatuneredownloaddialogbase.ui + DEPENDENCIES amarokcore-static )
--------------------------------------------------------------------- To unsubscribe, e-mail: trinity-devel-unsubscribe@lists.pearsoncomputing.net For additional commands, e-mail: trinity-devel-help@lists.pearsoncomputing.net Read list messages on the web archive: http://trinity-devel.pearsoncomputing.net/ Please remember not to top-post: http://trinity.pearsoncomputing.net/mailing_lists/#top-posting
On Saturday 30 of May 2020 20:34:07 deloptes wrote:
Slávek Banko wrote:
DEPENDENCIES amarokcore-static
Thank you Slavek!
It was close enough to fix it - perhaps magnatunebrowser is build first. Should I create a PR?
$ git diff diff --git a/amarok/src/magnatunebrowser/CMakeLists.txt b/amarok/src/magnatunebrowser/CMakeLists.txt index 6ed7fe3..9345696 100644 --- a/amarok/src/magnatunebrowser/CMakeLists.txt +++ b/amarok/src/magnatunebrowser/CMakeLists.txt @@ -33,4 +33,5 @@ tde_add_library( magnatunebrowser STATIC_PIC AUTOMOC magnatunelistview.cpp magnatuneredownloaddialog.cpp magnatuneredownloadhandler.cpp magnatunedownloadinfo.cpp magnatunealbumdownloader.cpp magnatuneredownloaddialogbase.ui
- DEPENDENCIES amarokcore-static
)
Oh - for magnatunebrowser there was no direct include for amarokconfig.h, but it was indirectly using playlist.h - that's why I overlooked it during my review. Thank you for finding and solving!
Since I already had a branch ready for the first part, I added your second part and pushed it. At the same time I added Signed-off-by for you too. You can verify it in TDE/amarok#17 - see:
https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/pulls/17
Cheers
On Sunday 31 of May 2020 10:54:21 Slávek Banko wrote:
On Saturday 30 of May 2020 20:34:07 deloptes wrote:
Slávek Banko wrote:
DEPENDENCIES amarokcore-static
Thank you Slavek!
It was close enough to fix it - perhaps magnatunebrowser is build first. Should I create a PR?
$ git diff diff --git a/amarok/src/magnatunebrowser/CMakeLists.txt b/amarok/src/magnatunebrowser/CMakeLists.txt index 6ed7fe3..9345696 100644 --- a/amarok/src/magnatunebrowser/CMakeLists.txt +++ b/amarok/src/magnatunebrowser/CMakeLists.txt @@ -33,4 +33,5 @@ tde_add_library( magnatunebrowser STATIC_PIC AUTOMOC magnatunelistview.cpp magnatuneredownloaddialog.cpp magnatuneredownloadhandler.cpp magnatunedownloadinfo.cpp magnatunealbumdownloader.cpp magnatuneredownloaddialogbase.ui
- DEPENDENCIES amarokcore-static
)
Oh - for magnatunebrowser there was no direct include for amarokconfig.h, but it was indirectly using playlist.h - that's why I overlooked it during my review. Thank you for finding and solving!
Since I already had a branch ready for the first part, I added your second part and pushed it. At the same time I added Signed-off-by for you too. You can verify it in TDE/amarok#17 - see:
https://mirror.git.trinitydesktop.org/gitea/TDE/amarok/pulls/17
Cheers
Emanoil,
Please, did you test PR for Amarok? Is the problem solved - is it possible to merge?
Cheers
Slávek Banko wrote:
Emanoil,
Please, did you test PR for Amarok? Is the problem solved - is it possible to merge?
yes it is solved - please merge and thank you.
--------------------------------------------------------------------- To unsubscribe, e-mail: trinity-devel-unsubscribe@lists.pearsoncomputing.net For additional commands, e-mail: trinity-devel-help@lists.pearsoncomputing.net Read list messages on the web archive: http://trinity-devel.pearsoncomputing.net/ Please remember not to top-post: http://trinity.pearsoncomputing.net/mailing_lists/#top-posting
On Monday 01 of June 2020 20:59:44 deloptes wrote:
Slávek Banko wrote:
Emanoil,
Please, did you test PR for Amarok? Is the problem solved - is it possible to merge?
yes it is solved - please merge and thank you.
Thank you - merged.
Cheers
-
deloptes -
Slávek Banko