|
1 |
| ---- /cmake/project-config-version.cmake.in 2023-12-05 10:44:44 |
2 |
| -+++ /cmake/project-config-version.cmake.in 2023-12-06 09:45:53 |
3 |
| -@@ -22,45 +22,7 @@ |
4 |
| - set (CMAKE_CROSSCOMPILING_STR "OFF") |
| 1 | +--- project-config-version.cmake.in 2024-08-28 10:50:19 |
| 2 | ++++ project-config-version.cmake.in 2024-08-28 11:15:36 |
| 3 | +@@ -15,35 +15,7 @@ |
| 4 | + math (EXPR MSVC_TOOLSET_MAJOR "${MSVC_TOOLSET_VERSION}/10") |
5 | 5 | endif ()
|
6 |
| - |
| 6 | + |
7 | 7 | -if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_VARIANT_NAME@")
|
8 | 8 | - # Check package name (in particular, because of the way cmake finds
|
9 | 9 | - # package config files, the capitalization could easily be "wrong").
|
|
25 | 25 | - # Reject if there's a mismatch in MSVC compiler versions
|
26 | 26 | - set (REASON "MSVC_TOOLSET_VERSION = @MSVC_TOOLSET_VERSION@")
|
27 | 27 | - set (PACKAGE_VERSION_UNSUITABLE TRUE)
|
28 |
| --elseif (NOT CMAKE_CROSSCOMPILING_STR STREQUAL "@CMAKE_CROSSCOMPILING_STR@") |
29 |
| -- # Reject if there's a mismatch in ${CMAKE_CROSSCOMPILING} |
30 |
| -- set (REASON "cross-compiling = @CMAKE_CROSSCOMPILING@") |
31 |
| -- set (PACKAGE_VERSION_UNSUITABLE TRUE) |
32 |
| --elseif (CMAKE_CROSSCOMPILING AND |
33 |
| -- NOT (CMAKE_SYSTEM_NAME STREQUAL "@CMAKE_SYSTEM_NAME@" AND |
34 |
| -- CMAKE_SYSTEM_PROCESSOR STREQUAL "@CMAKE_SYSTEM_PROCESSOR@")) |
35 |
| -- # Reject if cross-compiling and there's a mismatch in the target system |
36 |
| -- set (REASON "target = @CMAKE_SYSTEM_NAME@-@CMAKE_SYSTEM_PROCESSOR@") |
37 |
| -- set (PACKAGE_VERSION_UNSUITABLE TRUE) |
38 | 28 | -elseif (PACKAGE_FIND_VERSION)
|
39 | 29 | - if (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
|
40 | 30 | - set (PACKAGE_VERSION_EXACT TRUE)
|
|
44 | 34 | - endif ()
|
45 | 35 | -endif ()
|
46 | 36 | +set (PACKAGE_VERSION_COMPATIBLE TRUE)
|
47 |
| - |
| 37 | + |
48 | 38 | # If unsuitable, append the reason to the package version so that it's
|
49 | 39 | # visible to the user.
|
0 commit comments