diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-11-05 14:47:44 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2020-11-05 14:47:44 +0300 |
| commit | 84ba6ced7a44e1413b7616ecc13114a05fdd982c (patch) | |
| tree | c70084588ea74df3d16c2a5945302a0c8aeb9eb1 /CMakeLists.txt | |
| parent | da0554362ad9c1a7e7c65e844bcb1bb59f44846e (diff) | |
Initialise OEM_THEME_DIR before its used
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bd30f2e0b..de4404e73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,12 @@ include(CTest) include(OCConfigPluginDir) + +if (EXISTS "${PROJECT_SOURCE_DIR}/branding") + set(OEM_THEME_DIR "${PROJECT_SOURCE_DIR}/branding" CACHE STRING "The directory containing a custom theme") +else() + set(OEM_THEME_DIR "${PROJECT_SOURCE_DIR}" CACHE STRING "Define directory containing a custom theme") +endif() include("${CMAKE_CURRENT_LIST_DIR}/THEME.cmake") set(synclib_NAME "${APPLICATION_EXECUTABLE}sync") @@ -86,11 +92,6 @@ set(DATADIR "share") 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 option(TOKEN_AUTH_ONLY "TOKEN_AUTH_ONLY" OFF) |