> On Aug. 10, 2015, 12:28 p.m., Friedrich W. H. Kossebau wrote: > > krita/data/profiles/CMakeLists.txt, line 8 > > <https://git.reviewboard.kde.org/r/124630/diff/1/?file=390416#file390416line8> > > > > This is not a proper substitution: > > `${DATA_INSTALL_DIR}` points to `share/apps`, while here the files > > should be installed to `share/color` (so with `color` on the same level as > > `apps`, like `icons`, `sounds` etc. > > > > Which results in all files now installed in wrong location > > `share/apps/color`, instead of `share/color`. > > > > So breaks things completely. > > > > Not sure what you are trying to fix exactly: > > How does using `${DATA_INSTALL_DIR}` vs. `${CMAKE_INSTALL_PREFIX}` fix > > the mentioned problem? IIRC (well, just looked up again) > > `FindKDE4Internal.cmake` derives `DATA_INSTALL_DIR` from > > `${CMAKE_INSTALL_PREFIX}`. > > Heiko Becker wrote: > Perhaps I was carried away by usage of ${DATA_INSTALL_DIR} everywhere > else. Sorry for that. > > And to answer the second question, it works because ${DATA_INSTALL_DIR} > derives from ${SHARE_INSTALL_PREFIX}, which itself indeed derives from > ${CMAKE_INSTALL_PREFIX}, but one can set it to a different location. > > `DESTINATION ${SHARE_INSTALL_PREFIX}/color/icc/krita` also looks like a > correct fix. > > Using the variables defined by ecm's KDEInstallDirs would even be a > better fix, in my opinion. But seeing that KDEInstallDirs is already > included, I guess this isn't done to keep the delta during porting as small > as possible?
For now I've reverted the commit: the default profiles were not showing up for our testers. I'm fine with any patch that fixes that, of course :-) - Boudewijn ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/124630/#review83653 ----------------------------------------------------------- On Aug. 5, 2015, 6:36 p.m., Heiko Becker wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/124630/ > ----------------------------------------------------------- > > (Updated Aug. 5, 2015, 6:36 p.m.) > > > Review request for Calligra. > > > Repository: calligra > > > Description > ------- > > Allowing to configure the install location, which is helpful with a > multiarch layout, where prefix might be something like /usr/<arch> but > arch independent data should be installed to /usr/share/... > > > Diffs > ----- > > active/CMakeLists.txt 8fa0c6f1c04220f9178d0be1ea27b5c1428cd4d2 > krita/data/profiles/CMakeLists.txt a2a997b30aa159a36369e3825a1c8962597f07c4 > krita/data/profiles/elles-icc-profiles/CMakeLists.txt > f252e164e506f40780523a4a0b1b545257b64801 > > Diff: https://git.reviewboard.kde.org/r/124630/diff/ > > > Testing > ------- > > Checked that the affected files get installed into the desired location. > > > Thanks, > > Heiko Becker > >
_______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
