diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-09 13:28:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-09 13:28:28 (GMT) |
| commit | 05d8892e6113272c9b9ab73ceb9c8319e6690a25 (patch) | |
| tree | 5ea42b3575d6b24118ffe6d25a3cbc24d3142be6 /Modules | |
| parent | 0682e77f3b65850d37d8d91533c62b30a348454b (diff) | |
| parent | 7e896029cd6bc0a19b7e0ed6fa7b876e0f1764b3 (diff) | |
| download | CMake-05d8892e6113272c9b9ab73ceb9c8319e6690a25.zip CMake-05d8892e6113272c9b9ab73ceb9c8319e6690a25.tar.gz CMake-05d8892e6113272c9b9ab73ceb9c8319e6690a25.tar.bz2 | |
Merge topic 'cmake-default-dir-install-permissions'
7e896029 CPack: enable setting default dir creation permissions
a4c82916 CPack test: expand output checking fallback
670ad047 Move file/dir permissions code to common file.
deeba85f CMake: enable setting default dir creation permissions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1433
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPack.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 3915943..ea7dc02 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -384,6 +384,12 @@ _cpack_set_default(CPACK_RESOURCE_FILE_WELCOME _cpack_set_default(CPACK_MODULE_PATH "${CMAKE_MODULE_PATH}") +# Set default directory creation permissions mode +if(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS) + _cpack_set_default(CPACK_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS + "${CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS}") +endif() + if(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL) set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON) endif() |