From c62609e0dc48935b67cda434a75f4da50c4990d4 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 9 Apr 2020 22:20:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D1=83?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=B7=D0=BD?= =?UTF-8?q?=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibGlobalVariables.cmake | 3 +++ hpp/cmlib_private_config.hpp.in | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMLibGlobalVariables.cmake b/CMLibGlobalVariables.cmake index 562e3ed..d2d11b2 100644 --- a/CMLibGlobalVariables.cmake +++ b/CMLibGlobalVariables.cmake @@ -4,6 +4,9 @@ canonical_string(${ORGANIZATION_NAME} CMLIB_ORGANIZATION_NAME_CANONICAL) string(TOLOWER ${CMLIB_ORGANIZATION_NAME_CANONICAL} CMLIB_ORGANIZATION_NAME_LOWER) string(TOLOWER ${CMLIB_PROJECT_NAME_CANONICAL} CMLIB_PROJECT_NAME_LOWER) +string(TOUPPER ${CMLIB_ORGANIZATION_NAME_CANONICAL} CMLIB_ORGANIZATION_NAME_UPPER) +string(TOUPPER ${CMLIB_PROJECT_NAME_CANONICAL} CMLIB_PROJECT_NAME_UPPER) + # CMLIB_MODULE_DIR foreach(_m ${CMAKE_MODULE_PATH}) if(EXISTS ${_m}/CMLibCommon.cmake) diff --git a/hpp/cmlib_private_config.hpp.in b/hpp/cmlib_private_config.hpp.in index b0a32a5..afc1bd3 100644 --- a/hpp/cmlib_private_config.hpp.in +++ b/hpp/cmlib_private_config.hpp.in @@ -15,13 +15,13 @@ #if defined (CMLIB_ORGANIZATION_NAME_LOWER) #error "Duplicate definition of macros CMLIB_ORGANIZATION_NAME_LOWER" #else -#define CMLIB_ORGANIZATION_NAME_LOWER "@ORGANIZATION_NAME_LOWER@" +#define CMLIB_ORGANIZATION_NAME_LOWER "@CMLIB_ORGANIZATION_NAME_LOWER@" #endif #if defined (CMLIB_ORGANIZATION_NAME_UPPER) #error "Duplicate definition of macros CMLIB_ORGANIZATION_NAME_UPPER" #else -#define CMLIB_ORGANIZATION_NAME_UPPER "@ORGANIZATION_NAME_UPPER@" +#define CMLIB_ORGANIZATION_NAME_UPPER "@CMLIB_ORGANIZATION_NAME_UPPER@" #endif #if defined (CMLIB_PROJECT_NAME) @@ -33,13 +33,13 @@ #if defined (CMLIB_PROJECT_NAME_LOWER) #error "Duplicate definition of macros CMLIB_PROJECT_NAME_LOWER" #else -#define CMLIB_PROJECT_NAME_LOWER "@CMAKE_PROJECT_NAME_LOWER@" +#define CMLIB_PROJECT_NAME_LOWER "@CMLIB_PROJECT_NAME_LOWER@" #endif #if defined (CMLIB_PROJECT_NAME_UPPER) #error "Duplicate definition of macros CMLIB_PROJECT_NAME_UPPER" #else -#define CMLIB_PROJECT_NAME_UPPER "@CMAKE_PROJECT_NAME_UPPER@" +#define CMLIB_PROJECT_NAME_UPPER "@CMLIB_PROJECT_NAME_UPPER@" #endif #if defined (CMLIB_BUILD_TYPE)