diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-22 14:25:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-22 14:27:01 (GMT) |
| commit | f83f29dbaa254053ac7fe2cc0e6403908fc04ac9 (patch) | |
| tree | b1c96d76d17009d016752fb22f94f9b04ed4fa2a /Modules/CMakeDetermineCompilerId.cmake | |
| parent | 9e07ea190bcbd83ffb054cff525fc1a0336a1a7d (diff) | |
| parent | 9c07cefee541d47be9c378a9285711e07be7a16f (diff) | |
| download | CMake-f83f29dbaa254053ac7fe2cc0e6403908fc04ac9.zip CMake-f83f29dbaa254053ac7fe2cc0e6403908fc04ac9.tar.gz CMake-f83f29dbaa254053ac7fe2cc0e6403908fc04ac9.tar.bz2 | |
Merge topic 'vs-ApplicationTypeRevision'
9c07cefee5 VS: Fix ApplicationTypeRevision in builtin check projects
639e14def6 VS: Factor out helper to compute ApplicationTypeRevision
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3350
Diffstat (limited to 'Modules/CMakeDetermineCompilerId.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 2321e11..c7e5685 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -276,8 +276,8 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} else() set(id_system "") endif() - if(id_system AND CMAKE_SYSTEM_VERSION) - set(id_system_version "<ApplicationTypeRevision>${CMAKE_SYSTEM_VERSION}</ApplicationTypeRevision>") + if(id_system AND CMAKE_SYSTEM_VERSION MATCHES "^([0-9]+\\.[0-9]+)") + set(id_system_version "<ApplicationTypeRevision>${CMAKE_MATCH_1}</ApplicationTypeRevision>") else() set(id_system_version "") endif() |