From: Christian Kamm Date: Fri, 20 Apr 2018 12:57:21 +0000 (+0200) Subject: CMake: Add a default placeholder_suffix X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~596 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6347aeeed20b3807e5a501335f57e819f061cdd0;p=nextcloud-desktop.git CMake: Add a default placeholder_suffix To make themes work that don't define it explicitly. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 5df238838..f541e4143 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,12 +5,19 @@ project(client) set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") + set(OEM_THEME_DIR "" CACHE STRING "Define directory containing a custom theme") if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake ) include ( ${OEM_THEME_DIR}/OEM.cmake ) else () include ( ${CMAKE_SOURCE_DIR}/NEXTCLOUD.cmake ) endif() + +# Default suffix if the theme doesn't define one +if(NOT DEFINED APPLICATION_PLACEHOLDER_SUFFIX) + set(APPLICATION_PLACEHOLDER_SUFFIX "${APPLICATION_SHORTNAME}_placeholder" CACHE STRING "Placeholder suffix (not including the .)") +endif() + # need this logic to not mess with re/uninstallations via macosx.pkgproj if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient") set(APPLICATION_REV_DOMAIN_INSTALLER "com.ownCloud.client")