diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-04-20 15:26:54 +0100 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-04-25 10:43:45 +0100 |
| commit | bef4cdd905980b2c8a45a50e2201678c1e4e38af (patch) | |
| tree | 2463e7978a73f35cde707206863aefef2a359cfd /find-modules | |
| parent | 035c6fa9390ecb66422ee684be71eea692989009 (diff) | |
| download | extra-cmake-modules-bef4cdd905980b2c8a45a50e2201678c1e4e38af.tar.gz extra-cmake-modules-bef4cdd905980b2c8a45a50e2201678c1e4e38af.tar.bz2 | |
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.
REVIEW 117658
Diffstat (limited to 'find-modules')
| -rw-r--r-- | find-modules/ECMFindModuleHelpersStub.cmake | 1 | ||||
| -rw-r--r-- | find-modules/FindWayland.cmake | 2 | ||||
| -rw-r--r-- | find-modules/FindXCB.cmake | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/find-modules/ECMFindModuleHelpersStub.cmake b/find-modules/ECMFindModuleHelpersStub.cmake new file mode 100644 index 00000000..bb8c9a62 --- /dev/null +++ b/find-modules/ECMFindModuleHelpersStub.cmake @@ -0,0 +1 @@ +include(${CMAKE_CURRENT_LIST_DIR}/../modules/ECMFindModuleHelpers.cmake) diff --git a/find-modules/FindWayland.cmake b/find-modules/FindWayland.cmake index 79c93c81..11716f04 100644 --- a/find-modules/FindWayland.cmake +++ b/find-modules/FindWayland.cmake @@ -73,7 +73,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -include(${CMAKE_CURRENT_LIST_DIR}/../modules/ECMFindModuleHelpers.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) ecm_find_package_version_check(Wayland) diff --git a/find-modules/FindXCB.cmake b/find-modules/FindXCB.cmake index 8027bdf3..76d69fd7 100644 --- a/find-modules/FindXCB.cmake +++ b/find-modules/FindXCB.cmake @@ -81,7 +81,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #============================================================================= -include(${CMAKE_CURRENT_LIST_DIR}/../modules/ECMFindModuleHelpers.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) ecm_find_package_version_check(XCB) |