Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for <prefix>/lib/cmake/ search paths to find_package()

Browse Source 
Merge patch from upstream to support <prefix>/lib/cmake search path in
find_package() config mode. This enables reduction of /usr/lib cluttering
find_package_support_prefix_lib_cmake.diff - stolen from 2.6 branch.

Signed-off-by: Modestas Vainius <modestas@vainius.eu>
This commit is contained in:
Modestas Vainius 2008-12-10 00:15:34 +02:00
parent c750b4cc0b
commit 58ae442c9e
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,8 +1,11 @@
cmake (2.6.2-3~pre1) UNRELEASED; urgency=low
cmake (2.6.2-3~pre2) UNRELEASED; urgency=low
* Fix typo in cmake-qt-gui description.
* Merge patch from upstream to support <prefix>/lib/cmake search path in
find_package() config mode. This enables reduction of /usr/lib cluttering
(find_package_support_prefix_lib_cmake.diff).
-- Modestas Vainius <modestas@vainius.eu> Thu, 13 Nov 2008 10:54:06 +0200
-- Modestas Vainius <modestas@vainius.eu> Wed, 10 Dec 2008 00:29:40 +0200
cmake (2.6.2-2) experimental; urgency=low

31
debian/patches/find_package_support_prefix_lib_cmake.diff vendored Normal file
View File

@ -0,0 +1,31 @@
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -218,6 +218,7 @@
"UNIX (U), or Apple (A) conventions.\n"
" <prefix>/ (W)\n"
" <prefix>/(cmake|CMake)/ (W)\n"
+ " <prefix>/(share|lib)/cmake/<name>*/ (U)\n"
" <prefix>/(share|lib)/<name>*/ (U)\n"
" <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)\n"
"On systems supporting OS X Frameworks and Application Bundles "
@@ -1710,6 +1711,20 @@
common.push_back("lib");
common.push_back("share");
+ // PREFIX/(share|lib)/cmake/(Foo|foo|FOO).*/
+ {
+ cmFindPackageFileList lister(this);
+ lister
+ / cmFileListGeneratorFixed(prefix)
+ / cmFileListGeneratorEnumerate(common)
+ / cmFileListGeneratorFixed("cmake")
+ / cmFileListGeneratorProject(this->Names);
+ if(lister.Search())
+ {
+ return true;
+ }
+ }
+
// PREFIX/(share|lib)/(Foo|foo|FOO).*/
{
cmFindPackageFileList lister(this);

1
debian/patches/series vendored
View File

@ -1,3 +1,4 @@
find_package_support_prefix_lib_cmake.diff
FindQt4.cmake2.6.diff
do-not-use-lib64.diff
findmpeg2-addpath.diff