diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2016-05-25 17:23:58 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2016-05-25 17:23:58 +0300 |
| commit | e960b265a8adb3e78037ca29033860a5d7de870a (patch) | |
| tree | 2f58ec1121aff9eebd0bad30a9696dc01ed17e28 /CMakeLists.txt | |
| parent | 1d93af5f647690ad4fe483442d0a6b97f26633a5 (diff) | |
| parent | f6b35e5d58b59ed02ba76f4d7df262b7952567d8 (diff) | |
Merge remote-tracking branch '2.1' into 2.2
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ed1ce6829..e3eb08bd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,4 @@ + cmake_minimum_required(VERSION 2.6) cmake_policy(VERSION 2.8.0) @@ -125,6 +126,17 @@ if(OWNCLOUD_5XX_NO_BLACKLIST) add_definitions(-DOWNCLOUD_5XX_NO_BLACKLIST=1) endif() +# When this option is enabled, a rename that is not allowed will be renamed back +# do the original as a restoration step. Withut this option, the restoration will +# re-download the file instead. +# The default is off because we don't want to rename the files back behind the user's back +# Added for IL issue #550 +option(OWNCLOUD_RESTORE_RENAME "OWNCLOUD_RESTORE_RENAME" OFF) +if(OWNCLOUD_RESTORE_RENAME) + add_definitions(-DOWNCLOUD_RESTORE_RENAME=1) +endif() + + if(APPLE) set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" ) endif() |