From ccff2f9af03e4cd7069e49b657e600e1f965529a Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 29 Sep 2022 09:37:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B1?= =?UTF-8?q?=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MyxCMakeConfig.cmake | 9 ++++----- lib/SemanticProjectVersion.cmake | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/MyxCMakeConfig.cmake b/MyxCMakeConfig.cmake index f6a21b4..d606d3c 100644 --- a/MyxCMakeConfig.cmake +++ b/MyxCMakeConfig.cmake @@ -2,11 +2,6 @@ cmake_policy(PUSH) cmake_policy(SET CMP0057 NEW) # IN_LIST operator get_filename_component(MYX_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_LIST_FILE}" DIRECTORY) -get_filename_component(PROJECT_CMAKE_DIR ${MYX_CMAKE_SOURCE_DIR} DIRECTORY) - -if(NOT MYX_CMAKE_SOURCE_DIR STREQUAL "${PROJECT_SOURCE_DIR}/cmake/myx") - message(FATAL_ERROR "MyxCMake library should be placed in ${PROJECT_SOURCE_DIR}/cmake/myx directory") -endif() set(MYX_CMAKE_BACKPORTS_DIR "${MYX_CMAKE_SOURCE_DIR}/backports") set(MYX_CMAKE_LIB_DIR "${MYX_CMAKE_SOURCE_DIR}/lib") @@ -23,4 +18,8 @@ include(${MYX_CMAKE_LIB_DIR}/DirectoriesGuards.cmake) include(${MYX_CMAKE_LIB_DIR}/SemanticProjectVersion.cmake) include(${MYX_CMAKE_LIB_DIR}/NinjaGeneratorWrapper.cmake) +unset(MYX_CMAKE_SOURCE_DIR) +unset(MYX_CMAKE_BACKPORTS_DIR) +unset(MYX_CMAKE_LIB_DIR) + cmake_policy(POP) diff --git a/lib/SemanticProjectVersion.cmake b/lib/SemanticProjectVersion.cmake index 7835349..d40dbc8 100644 --- a/lib/SemanticProjectVersion.cmake +++ b/lib/SemanticProjectVersion.cmake @@ -10,7 +10,6 @@ function(myx_project_version_int) # cmake-format: off myx_is_semantic_project_version() math(EXPR v "(${PROJECT_VERSION_MAJOR} << 32) + (${PROJECT_VERSION_MINOR} << 16) + ${PROJECT_VERSION_PATCH}") - myx_message_notice(aaaa ${v}) set_property(GLOBAL PROPERTY PROJECT_VERSION_INT ${v}) # cmake-format: on endfunction()