From 49b06f12cb07bb90880f83edf865949fcc42c239 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Sat, 8 Oct 2022 23:37:22 +0300
Subject: [PATCH] 2.0.12

---
 MyxCMake/MyxCMakeConfigVersion.cmake | 2 +-
 MyxCMake/lib/AddLibrary.cmake        | 7 ++-----
 MyxCMake/lib/FetchContentAdd.cmake   | 9 ++-------
 README.md                            | 2 +-
 VERSION                              | 2 +-
 debian/CMakeLists.txt                | 2 +-
 debian/changelog                     | 2 +-
 myx_setup.cmake                      | 4 ++--
 8 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake
index 1dc8a69..c98d89b 100644
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.0.11")
+set(MYX_CMAKE_PACKAGE_VERSION "2.0.12")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
diff --git a/MyxCMake/lib/AddLibrary.cmake b/MyxCMake/lib/AddLibrary.cmake
index da573a6..39951f4 100644
--- a/MyxCMake/lib/AddLibrary.cmake
+++ b/MyxCMake/lib/AddLibrary.cmake
@@ -46,11 +46,7 @@ function(myx_add_library NAME TYPE)
   if(TYPE STREQUAL "INTERFACE")
     # Библиотека, состоящая только из заголовочных файлов не требует сборки.
     # Стандартные пути к заголовочным файлам
-    target_include_directories(${NAME}
-      INTERFACE
-        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-    )
+    target_include_directories(${NAME} SYSTEM INTERFACE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
   else()
     string(TOUPPER ${NAME} PROJECT_NAME_UPPER)
     # Опция для разрешения сборки динамической библиотеки
@@ -218,6 +214,7 @@ function(myx_add_library NAME TYPE)
 
   if(TYPE STREQUAL "INTERFACE")
     # Установка библиотеки из заголовочных файлов
+    target_include_directories(${NAME} SYSTEM INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
     install(
       TARGETS ${NAME}
       EXPORT ${NAME}Targets
diff --git a/MyxCMake/lib/FetchContentAdd.cmake b/MyxCMake/lib/FetchContentAdd.cmake
index a8a2424..d2766b4 100644
--- a/MyxCMake/lib/FetchContentAdd.cmake
+++ b/MyxCMake/lib/FetchContentAdd.cmake
@@ -51,11 +51,6 @@ function(FetchContent_Add NAME)
     GIT_SHALLOW 1
     )
 
-  string(TOLOWER ${NAME} lower_name)
-  FetchContent_GetProperties(${NAME})
-  if(NOT ${lower_name}_POPULATED)
-    FetchContent_Populate(${NAME})
-    add_subdirectory(${${NAME}_SOURCE_DIR} ${${NAME}_BINARY_DIR})
-  endif()
-
+  set(FETCHCONTENT_QUIET off)
+  FetchContent_MakeAvailable(${NAME})
 endfunction()
diff --git a/README.md b/README.md
index 51b8d99..ab5f8d1 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.0.11/myx-cmake-local-2.0.11.tar.xz ).
+[архив](../../../releases/download/2.0.12/myx-cmake-local-2.0.12.tar.xz ).
 
 ## Использование
 
diff --git a/VERSION b/VERSION
index 6cbacdc..280a1e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.11
+2.0.12
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index be54c23..af056a5 100644
--- a/debian/CMakeLists.txt
+++ b/debian/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-project(myx-cmake VERSION 2.0.11 LANGUAGES)
+project(myx-cmake VERSION 2.0.12 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
diff --git a/debian/changelog b/debian/changelog
index 0492f89..0213195 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-myx-cmake (2.0.11) unstable; urgency=medium
+myx-cmake (2.0.12) unstable; urgency=medium
 
   * New version.
 
diff --git a/myx_setup.cmake b/myx_setup.cmake
index 6062236..784572d 100644
--- a/myx_setup.cmake
+++ b/myx_setup.cmake
@@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR})
   set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
 endif()
 if(MYX_CMAKE_DIR)
-  find_package(MyxCMake 2.0.11 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.0.12 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
   myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
 else()
   if(MYX_CMAKE_USE_SYSTEM)
-    find_package(MyxCMake 2.0.11 REQUIRED)
+    find_package(MyxCMake 2.0.12 REQUIRED)
     myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)