diff options
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | THEME.cmake | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f2c28f328..bd30f2e0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,9 @@ endif(WIN32) set(SHAREDIR ${DATADIR}) set(OEM_THEME_DIR "${PROJECT_SOURCE_DIR}" CACHE STRING "Define directory containing a custom theme") +if ("${OEM_THEME_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}" AND EXISTS "${PROJECT_SOURCE_DIR}/branding") + set(OEM_THEME_DIR "${PROJECT_SOURCE_DIR}/branding" CACHE STRING "We are using a branding" FORCE) +endif() # this option removes Http authentication, keychain, shibboleth etc and is intended for # external authentication mechanisms diff --git a/THEME.cmake b/THEME.cmake index c0de50c6f..ee316c628 100644 --- a/THEME.cmake +++ b/THEME.cmake @@ -4,6 +4,8 @@ else() include ("${CMAKE_CURRENT_LIST_DIR}/OWNCLOUD.cmake") endif() +message(STATUS "Branding: ${APPLICATION_NAME}") + # Default suffix if the theme doesn't define one if(NOT DEFINED APPLICATION_VIRTUALFILE_SUFFIX) set(APPLICATION_VIRTUALFILE_SUFFIX "${APPLICATION_SHORTNAME}_virtual" CACHE STRING "Virtual file suffix (not including the .)") |