Review Request 128917: Make sure we don't add the appstream test twice

[Mauro Carvalho Chehab]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/128917/#review99212
-----------------------------------------------------------



Tested here, and it indeed fixed the issue.

- Mauro Carvalho Chehab


On Sept. 15, 2016, 12:07 p.m., Bhushan Shah wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/128917/
> -----------------------------------------------------------
> 
> (Updated Sept. 15, 2016, 12:07 p.m.)
> 
> 
> Review request for KDE Frameworks and Aleix Pol Gonzalez.
> 
> 
> Repository: extra-cmake-modules
> 
> 
> Description
> -------
> 
> If KDECMakeSettings is included twice for any reasons cmake fails because include guard variable is not scoped to parent, and resulting in being reset when function scope was complete.
> 
> See following testcase,
> 
> 
> ```
> find_package(ECM REQUIRED NO_MODULE)
> set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
> 
> include(KDEInstallDirs)
> include(KDECMakeSettings)
> include(KDECMakeSettings)
> ```
> 
> And errors,
> 
> 
> ```
> CMake Error at /opt/kde/share/ECM/kde-modules/KDECMakeSettings.cmake:149 (add_test):
>   add_test given test NAME "appstreamtest" which already exists in this
>   directory.
> Call Stack (most recent call first):
>   /opt/kde/share/ECM/kde-modules/KDECMakeSettings.cmake:167 (appstreamtest)
>   CMakeLists.txt:6 (include)
> ```
> 
> 
> Diffs
> -----
> 
>   kde-modules/KDECMakeSettings.cmake 523271a 
> 
> Diff: https://git.reviewboard.kde.org/r/128917/diff/
> 
> 
> Testing
> -------
> 
> see testcase in description
> 
> 
> Thanks,
> 
> Bhushan Shah
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20160915/51490edf/attachment-0001.html>