mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 06:09:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'fix-cps-version' into release-3.31

Browse Source 
f04dd93c47 cmExportPackageInfoGenerator: Fix version properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9914
This commit is contained in:
Brad King
2024-10-18 11:39:59 +00:00
committed by Kitware Robot
parent b3a90110ce f04dd93c47
commit 5a459163dc
4 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmExportPackageInfoGenerator.cxx
View File

@@ -106,10 +106,10 @@ Json::Value cmExportPackageInfoGenerator::GeneratePackageInfo() const
if (!this->PackageVersion.empty()) {
package["version"] = this->PackageVersion;
if (!this->PackageVersion.empty()) {
if (!this->PackageVersionCompat.empty()) {
package["compat_version"] = this->PackageVersionCompat;
}
if (!this->PackageVersion.empty()) {
if (!this->PackageVersionSchema.empty()) {
package["version_schema"] = this->PackageVersionSchema;
}
}

21
Tests/RunCMake/PackageInfo/MinimalVersion-check.cmake Normal file
View File

@@ -0,0 +1,21 @@
include(${CMAKE_CURRENT_LIST_DIR}/Assertions.cmake)
set(out_dir "${RunCMake_BINARY_DIR}/MinimalVersion-build/CMakeFiles/Export/510c5684a4a8a792eadfb55bc9744983")
file(READ "${out_dir}/foo1.cps" content)
expect_value("${content}" "foo1" "name")
expect_value("${content}" "1.0" "version")
expect_missing("${content}" "compat_version")
expect_missing("${content}" "version_schema")
file(READ "${out_dir}/foo2.cps" content)
expect_value("${content}" "foo2" "name")
expect_value("${content}" "1.5" "version")
expect_value("${content}" "1.0" "compat_version")
expect_missing("${content}" "version_schema")
file(READ "${out_dir}/foo3.cps" content)
expect_value("${content}" "foo3" "name")
expect_value("${content}" "1.0" "version")
expect_missing("${content}" "compat_version")
expect_value("${content}" "simple" "version_schema")

19
Tests/RunCMake/PackageInfo/MinimalVersion.cmake Normal file
View File

@@ -0,0 +1,19 @@
add_library(foo INTERFACE)
install(TARGETS foo EXPORT foo DESTINATION .)
install(PACKAGE_INFO foo1
EXPORT foo
VERSION 1.0
DESTINATION cps)
install(PACKAGE_INFO foo2
EXPORT foo
VERSION 1.5
COMPAT_VERSION 1.0
DESTINATION cps)
install(PACKAGE_INFO foo3
EXPORT foo
VERSION 1.0
VERSION_SCHEMA simple
DESTINATION cps)

1
Tests/RunCMake/PackageInfo/RunCMakeTest.cmake
View File

@@ -27,6 +27,7 @@ run_cmake(Appendix)
run_cmake(InterfaceProperties)
run_cmake(Metadata)
run_cmake(Minimal)
run_cmake(MinimalVersion)
run_cmake(LowerCaseFile)
run_cmake(Requirements)
run_cmake(TargetTypes)