From a017ca6814f50b0c121ccf5cc2bc9e12e977538c Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Fri, 18 Jun 2021 01:16:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B2=D0=BD=D0=B5=D1=88=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=B9=20CMLib?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe02071..d8dbca3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,13 +11,15 @@ set(CMLIB_AUTHOR_NAME "Андрей Астафьев" CACHE STRING "")
 set(CMLIB_AUTHOR_EMAIL "dev@246060.ru" CACHE STRING "")
 set(CMLIB_DESCRIPTION "Разные функции" CACHE STRING "")
 
-# В каталоге cmake/lib находятся файлы с библиотечными функциями
-if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/cmlib)
-  list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/cmlib)
-else()
-  message(FATAL_ERROR "CMake library directory not exists")
+# В каталоге cmake/cmlib находятся файлы с библиотечными функциями
+if(NOT DEFINED CMLIB_MAIN_DIR)
+  set(CMLIB_MAIN_DIR "${CMAKE_SOURCE_DIR}/cmake/cmlib")
+endif()
+if(IS_DIRECTORY "${CMLIB_MAIN_DIR}" AND EXISTS "${CMLIB_MAIN_DIR}/CMLibCommon.cmake")
+  list(INSERT CMAKE_MODULE_PATH 0 "${CMLIB_MAIN_DIR}")
+else()
+  message(FATAL_ERROR "CMLib main directory ${CMLIB_MAIN_DIR} does not exists")
 endif()
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/find)
 
 if(NOT DEFINED MYXLIB_MASTER_PROJECT)
   if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)