[kdeplasma-addons] /: only have one call to project() it's all the same project and it causes variables to get overwritten

Christophe Giboudeaux cgiboudeaux at gmx.com
Mon Mar 9 20:29:41 UTC 2015


On Monday 09 March 2015 15:47:08 Jonathan Riddell wrote:
> Git commit 45bc8242e586d1a5372d9da49b3368561d651ab9 by Jonathan Riddell.
> Committed on 09/03/2015 at 15:46.
> Pushed by jriddell into branch 'master'.
> 
> only have one call to project() it's all the same project and it causes
> variables to get overwritten
> 
> M  +0    -3    applets/comic/CMakeLists.txt
> M  +0    -2    applets/fifteenPuzzle/CMakeLists.txt
> M  +0    -2    applets/timer/CMakeLists.txt
> M  +0    -1    dataengines/comic/CMakeLists.txt
> M  +0    -2    runners/converter/CMakeLists.txt
> 
> http://commits.kde.org/kdeplasma-addons/45bc8242e586d1a5372d9da49b3368561d65
> 1ab9
> 
> diff --git a/applets/comic/CMakeLists.txt b/applets/comic/CMakeLists.txt
> index 55926f7..06a48bb 100644
> --- a/applets/comic/CMakeLists.txt
> +++ b/applets/comic/CMakeLists.txt
> @@ -1,6 +1,3 @@
> -project(plasma-comic)
> -

[cut]

Sorry but which variables ? You've been doing these changes in several 
repositories without a real reason.

only PROJECT_[SOURCE|BINARY]_DIR is changed but I don't remember seeing it a 
lot in our CMakeLists.txt files (except in some you changed today).

You also made similar commits with this message: «remove second calls to 
project() only 1 allowed per cmake project»

Can you please find where this policy comes from before changing things that 
always worked ?

Oh and can you explain the benefit of :

-set(screensaver_xml 
${ksmserver_SOURCE_DIR}/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)
+set(screensaver_xml ${plasma-
workspace_SOURCE_DIR}/ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml)


Thanks.

Christophe


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-buildsystem/attachments/20150309/624c5d7b/attachment.sig>


More information about the Kde-buildsystem mailing list