From 2d990c174706b56d78dccbb45305046ba5eabf07 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sun, 29 Mar 2020 08:55:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibConfigHPPGenerate.cmake | 2 +- CMLibGlobalVariables.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMLibConfigHPPGenerate.cmake b/CMLibConfigHPPGenerate.cmake index b1e6da2..ea2c981 100644 --- a/CMLibConfigHPPGenerate.cmake +++ b/CMLibConfigHPPGenerate.cmake @@ -4,5 +4,5 @@ function(cmlib_config_hpp_generate) get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT) configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_config.hpp.in - ${CMAKE_BINARY_DIR}/include/cmlib_${CMLIB_PROJECT_NAME_LOWER}_config.hpp) + ${CMAKE_BINARY_DIR}/include/${CMLIB_PROJECT_NAME_LOWER}_cmlib_config.hpp) endfunction() diff --git a/CMLibGlobalVariables.cmake b/CMLibGlobalVariables.cmake index 9f583cd..562e3ed 100644 --- a/CMLibGlobalVariables.cmake +++ b/CMLibGlobalVariables.cmake @@ -1,5 +1,5 @@ -canonical_string(PROJECT_NAME CMLIB_PROJECT_NAME_CANONICAL) -canonical_string(ORGANIZATION_NAME CMLIB_ORGANIZATION_NAME_CANONICAL) +canonical_string(${PROJECT_NAME} CMLIB_PROJECT_NAME_CANONICAL) +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)