Review Request 117658: Add a stub for ECMFindModuleHelpers to the find-modules dir

[Kevin Ottens]

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

Ship it!


Ship It!

- Kevin Ottens


On April 20, 2014, 3 p.m., Alex Merry wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/117658/
> -----------------------------------------------------------
> 
> (Updated April 20, 2014, 3 p.m.)
> 
> 
> Review request for Build System, Extra Cmake Modules and KDE Frameworks.
> 
> 
> Repository: extra-cmake-modules
> 
> 
> Description
> -------
> 
> Split up module execution tests
> 
> Find module tests now use find_package(), and there is a version for
> when CMAKE_MODULE_PATH is set and a version for when
> ecm_use_find_modules() is used.
> 
> KDE modules are also now tested.
> 
> Add a stub for ECMFindModuleHelpers to the find-modules dir
> 
> ECMUseFindModules allows find modules to be copied to a local directory.
> These find modules may use ECMFindModuleHelpers, but they will not be in
> the same relative location to ECMFindModuleHelpers.cmake and there is no
> guarantee that ECMFindModulesHelpers.cmake will be in the CMake module
> path.
> 
> To solve this, we make sure there is always a stub file in the same
> directory as the find modules that includes the real
> ECMFindModuleHelpers.cmake. The one installed with ECM just includes
> "../modules/ECMFindModuleHelpers.cmake", while ecm_use_find_modules
> generates a stub that uses an absolute path.
> 
> 
> Diffs
> -----
> 
>   find-modules/FindWayland.cmake b7790e750e8ae9b1c6d5be81b7683b489d60a5a7 
>   find-modules/ECMFindModuleHelpersStub.cmake PRE-CREATION 
>   find-modules/FindXCB.cmake dd876b214edd35993b8e8d3582536a24776a2e64 
>   modules/ECMUseFindModules.cmake 25f42666ceaecdac4034caf43c31f3f219f9070b 
>   tests/CMakeLists.txt e464a0305bd71364463c3132103ffe02dcb94eb6 
>   tests/ExecuteAllModules/CMakeLists.txt 12e86c15d209ff38340af0dd0a5900091ce4cadb 
>   tests/ExecuteAllModules/main.c  
>   tests/ExecuteCoreModules/CMakeLists.txt PRE-CREATION 
>   tests/ExecuteKDEModules/CMakeLists.txt PRE-CREATION 
>   tests/ExecuteKDEModules/main.c PRE-CREATION 
>   tests/FindModules/CMakeLists.txt PRE-CREATION 
>   tests/FindModules/main.c PRE-CREATION 
>   tests/UseFindModules/CMakeLists.txt PRE-CREATION 
>   tests/UseFindModules/main.c PRE-CREATION 
> 
> Diff: https://git.reviewboard.kde.org/r/117658/diff/
> 
> 
> Testing
> -------
> 
> Tests pass. Also made a little test that called find_package(Wayland), both using set(CMAKE_MODULE_PATH ${ECM_FIND_MODULE_DIR}) and using ecm_use_find_modules(), and Wayland was found both times.
> 
> 
> Thanks,
> 
> Alex Merry
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-buildsystem/attachments/20140424/bc8c8826/attachment.html>