Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-15 03:48:02 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'backport-pkg-root-var' into pkg-root-var

Browse Source
This commit is contained in:
Brad King
2025-10-02 15:28:03 -04:00
parent 9cab1062e4 d029b828b2
commit fc059e1978
5 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmFindPackageCommand.cxx
View File

@@ -1349,7 +1349,7 @@ bool cmFindPackageCommand::FindPackageUsingConfigMode()
this->Configs.emplace_back(std::move(config), pdt::Cps);
config = cmStrCat(cmSystemTools::LowerCase(n), ".cps");
if (config != this->Configs.front().Name) {
if (config != this->Configs.back().Name) {
this->Configs.emplace_back(std::move(config), pdt::Cps);
}
}

14
Tests/RunCMake/find_package-CPS/MissingVersion1-stderr.txt
View File

@@ -3,11 +3,15 @@ CMake Error at MissingVersion1\.cmake:[0-9]+ \(find_package\):
with requested version "1\.2\.7"\.
The following configuration files were considered but not accepted:
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/sample\.cps, version: 1\.5\.0\+niven
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/sample\.cps, version: 1\.4\.2\+adams
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/sample\.cps, version: 1\.2\.3\+clarke
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/sample\.cps, version: 1\.1\.0\+asimov
(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/[Ss]ample\.cps, version: 1\.5\.0\+niven)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/[Ss]ample\.cps, version: 1\.4\.2\+adams)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/[Ss]ample\.cps, version: 1\.2\.3\+clarke)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/[Ss]ample\.cps, version: 1\.1\.0\+asimov)+
Call Stack \(most recent call first\):
CMakeLists\.txt:3 \(include\)

14
Tests/RunCMake/find_package-CPS/MissingVersion2-stderr.txt
View File

@@ -3,11 +3,15 @@ CMake Error at MissingVersion2\.cmake:[0-9]+ \(find_package\):
with requested version "1\.4\.9"\.
The following configuration files were considered but not accepted:
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/sample\.cps, version: 1\.5\.0\+niven
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/sample\.cps, version: 1\.4\.2\+adams
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/sample\.cps, version: 1\.2\.3\+clarke
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/sample\.cps, version: 1\.1\.0\+asimov
(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/[Ss]ample\.cps, version: 1\.5\.0\+niven)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/[Ss]ample\.cps, version: 1\.4\.2\+adams)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/[Ss]ample\.cps, version: 1\.2\.3\+clarke)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/[Ss]ample\.cps, version: 1\.1\.0\+asimov)+
Call Stack \(most recent call first\):
CMakeLists\.txt:3 \(include\)

14
Tests/RunCMake/find_package-CPS/VersionLimit3-stderr.txt
View File

@@ -3,11 +3,15 @@ CMake Error at VersionLimit3\.cmake:[0-9]+ \(find_package\):
with requested version range "1\.2\.0\.\.\.1\.2\.2"\.
The following configuration files were considered but not accepted:
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/sample\.cps, version: 1\.5\.0\+niven
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/sample\.cps, version: 1\.4\.2\+adams
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/sample\.cps, version: 1\.2\.3\+clarke
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/sample\.cps, version: 1\.1\.0\+asimov
(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/[Ss]ample\.cps, version: 1\.5\.0\+niven)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/[Ss]ample\.cps, version: 1\.4\.2\+adams)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/[Ss]ample\.cps, version: 1\.2\.3\+clarke)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/[Ss]ample\.cps, version: 1\.1\.0\+asimov)+
Call Stack \(most recent call first\):
CMakeLists\.txt:3 \(include\)

14
Tests/RunCMake/find_package-CPS/VersionLimit4-stderr.txt
View File

@@ -3,11 +3,15 @@ CMake Error at VersionLimit4\.cmake:[0-9]+ \(find_package\):
with requested version range "1\.2\.0\.\.\.<1\.2\.3"\.
The following configuration files were considered but not accepted:
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/sample\.cps, version: 1\.5\.0\+niven
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/sample\.cps, version: 1\.4\.2\+adams
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/sample\.cps, version: 1\.2\.3\+clarke
.*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/sample\.cps, version: 1\.1\.0\+asimov
(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/[Ss]ample\.cps, version: 1\.5\.0\+niven)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/[Ss]ample\.cps, version: 1\.4\.2\+adams)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/[Ss]ample\.cps, version: 1\.2\.3\+clarke)+(
[^
]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/[Ss]ample\.cps, version: 1\.1\.0\+asimov)+
Call Stack \(most recent call first\):
CMakeLists\.txt:3 \(include\)