From 5c495265f4f0fc49d23519b198f0f6b2d1606a03 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 9 Jan 2013 16:29:50 +0100 Subject: Consolidate theming support. This implements out-of-repository-theming, and removes the old custom.ini theming that never worked on all platforms and had no straight deployment story. The new approach requires the CMAKE variable OEM_THEME_DIR to point to a directory that must at least contain an OEM.cmake file (check OWNCLOUD.cmake for possible options) as well as a themes.qrc and a themes/ directory that directly correspond to the ones in the source tree. --- OwnCloudCPack.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OwnCloudCPack.cmake') diff --git a/OwnCloudCPack.cmake b/OwnCloudCPack.cmake index 7c9f9c156..e0a90bfe2 100644 --- a/OwnCloudCPack.cmake +++ b/OwnCloudCPack.cmake @@ -2,8 +2,8 @@ include( InstallRequiredSystemLibraries ) set( CPACK_PACKAGE_CONTACT "Dominik Schmidt " ) -if ( EXISTS "${CMAKE_SOURCE_DIR}/OEM.cmake" ) - include ( "${CMAKE_SOURCE_DIR}/OEM.cmake" ) +if ( DEFINED OEM_THEME_DIR AND EXISTS ${OEM_THEME_DIR}/OEM.cmake ) + include ( "${OEM_THEME_DIR}/OEM.cmake" ) else () include ( "${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake" ) endif() -- cgit v1.2.3