From 8b2fa4fd6440d1eec57c783ae2ef9910e317b3b8 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 11 Jun 2021 09:50:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=82=D0=B5=D0=BC=D1=8B=20=D0=BA=20CMAKE=5FINSTALL=5F?= =?UTF-8?q?PREFIX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibGlobalVariables.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CMLibGlobalVariables.cmake b/CMLibGlobalVariables.cmake index c618758..546dc62 100644 --- a/CMLibGlobalVariables.cmake +++ b/CMLibGlobalVariables.cmake @@ -14,12 +14,11 @@ string(TOUPPER ${CMLIB_ORGANIZATION_NAME_CANONICAL} CMLIB_ORGANIZATION_NAME_UPPE string(TOUPPER ${CMLIB_PROJECT_NAME_CANONICAL} CMLIB_PROJECT_NAME_UPPER) string(TOUPPER ${CMLIB_THEME_NAME_CANONICAL} CMLIB_THEME_NAME_UPPER) -option(CMLIB_USE_DEVELOPMENT_INSTALL_PREFIX "Auto-generated output prefix for development installation" OFF) -if(CMLIB_USE_DEVELOPMENT_INSTALL_PREFIX) - if(CMLIB_THEME_NAME_LOWER STREQUAL "default") - set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/_output" CACHE PATH "" FORCE) - else() - set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/_output/${CMLIB_THEME_NAME_LOWER}" CACHE PATH "" FORCE) +option(CMLIB_ADD_THEME_PREFIX "Append theme name to install prefix" OFF) +if(CMLIB_ADD_THEME_PREFIX AND NOT CMLIB_THEME_PREFIX_APPENDED) + if(NOT CMLIB_THEME_NAME_LOWER STREQUAL "default") + set(CMLIB_THEME_PREFIX_APPENDED ON CACHE BOOL "" FORCE) + set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${CMLIB_THEME_NAME}" CACHE PATH "" FORCE) endif() endif()