diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-20 15:09:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-20 15:09:14 (GMT) |
| commit | 66b37132b6c7d347a0fe83ee5082a751e8e0d9aa (patch) | |
| tree | 3b5f9fa1232026762b90716d976dc33de315b8dd /Modules | |
| parent | 345ae8d0e1133971e8acff93d6fcdf653c4d2e11 (diff) | |
| parent | 325f34d1507d391e5125d0a57e3575ecbe4e6f13 (diff) | |
| download | CMake-66b37132b6c7d347a0fe83ee5082a751e8e0d9aa.zip CMake-66b37132b6c7d347a0fe83ee5082a751e8e0d9aa.tar.gz CMake-66b37132b6c7d347a0fe83ee5082a751e8e0d9aa.tar.bz2 | |
Merge topic 'cpack-minor-cleanup-and-tests-extension'
325f34d1 CPack tests: add possibility for expecting config developer warnings
176281e1 CPack test: correctly handle CPACK_PACKAGING_INSTALL_PREFIX
cf0c2599 CPack: set variable commands in lower case
2ff906b3 CPack: documentation typo fix
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1499
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPack.cmake | 2 | ||||
| -rw-r--r-- | Modules/CPackComponent.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index ea7dc02..812917f 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -338,7 +338,7 @@ function(cpack_encode_variables) set(value "${${var}}") endif() - string(APPEND commands "\nSET(${var} \"${value}\")") + string(APPEND commands "\nset(${var} \"${value}\")") endif() endforeach() diff --git a/Modules/CPackComponent.cmake b/Modules/CPackComponent.cmake index 2374fbd..6c122e5 100644 --- a/Modules/CPackComponent.cmake +++ b/Modules/CPackComponent.cmake @@ -66,7 +66,7 @@ # the component differently depending on the value of this variable: # # * ONE_PER_GROUP (default): creates one package file per component group -# * ALL_COMPONENTS_IN_ONE : creates a single package with all (requested) component +# * ALL_COMPONENTS_IN_ONE : creates a single package with all (requested) components # * IGNORE : creates one package per component, i.e. IGNORE component group # # One can specify different grouping for different CPack generator by |