diff options
| author | Christian Kamm <kamm@incasoftware.de> | 2014-12-10 15:01:36 +0300 |
|---|---|---|
| committer | Christian Kamm <kamm@incasoftware.de> | 2014-12-10 15:01:36 +0300 |
| commit | 53d5de685c9d9a73899f02f739f15fd25c3efce0 (patch) | |
| tree | fdb4026b1cd50bfa319d3a980be585b3e54d1d3e /OWNCLOUD.cmake | |
| parent | e982790ad55374a85dced0b04a2cdb4f6807398b (diff) | |
| parent | f0ce8b8fd4f87eca0e5e1f33943448498c7eda5b (diff) | |
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
Diffstat (limited to 'OWNCLOUD.cmake')
| -rw-r--r-- | OWNCLOUD.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OWNCLOUD.cmake b/OWNCLOUD.cmake index b45249683..e923086d0 100644 --- a/OWNCLOUD.cmake +++ b/OWNCLOUD.cmake @@ -8,6 +8,9 @@ set( APPLICATION_UPDATE_URL "https://updates.owncloud.com/client/" CACHE string set( THEME_CLASS "ownCloudTheme" ) set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" ) set( WIN_SETUP_BITMAP_PATH "${CMAKE_SOURCE_DIR}/admin/win/nsi" ) + +set( MAC_INSTALLER_BACKGROUND_FILE "${CMAKE_SOURCE_DIR}/admin/osx/installer-background.png" CACHE STRING "The MacOSX installer background image") + # set( THEME_INCLUDE "${OEM_THEME_DIR}/mytheme.h" ) # set( APPLICATION_LICENSE "${OEM_THEME_DIR}/license.txt ) |