From 29b56561ca17969fbd03c6c601f614ebd1b87165 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Tue, 1 Jun 2021 14:24:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?=
 =?UTF-8?q?=D1=81=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B3=D0=B5=D0=BD=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B8=D1=80=D1=83=D0=B5=D0=BC=D1=8B=D0=BC=D0=B8=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D1=87=D0=BD=D1=8B=D0=BC?=
 =?UTF-8?q?=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt              | 2 ++
 cmake/cmlib                 | 2 +-
 cmake/etc/Variables.cmake   | 2 --
 src/myx/core/CMakeLists.txt | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed73e52..d890c93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,8 @@ find_package(Threads REQUIRED)
 # Qt5
 find_package(Qt5 COMPONENTS Core Network REQUIRED)
 
+cmlib_generate_private_config_hpp()
+
 # Библиотеки
 add_subdirectory(src/myx/backports/compiler)
 add_subdirectory(src/myx/backports/cpp)
diff --git a/cmake/cmlib b/cmake/cmlib
index 8fbf0a3..dbc0b76 160000
--- a/cmake/cmlib
+++ b/cmake/cmlib
@@ -1 +1 @@
-Subproject commit 8fbf0a3b3d8ef4598fe5c334067e2de321e04dae
+Subproject commit dbc0b76a76be90fa9875ad7ab8114dc9d487ee64
diff --git a/cmake/etc/Variables.cmake b/cmake/etc/Variables.cmake
index 8670e38..247ad53 100644
--- a/cmake/etc/Variables.cmake
+++ b/cmake/etc/Variables.cmake
@@ -8,5 +8,3 @@ set(DOXYGEN_GENERATE_HTML YES)
 set(CPACK_COMPONENTS_ALL examples)
 set(CPACK_PACKAGE_CONTACT "Andrei Astafev <dev@246060.ru>")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mixed functions")
-
-set(CMLIB_GENERATED_HEADERS_PATH ${CMAKE_BINARY_DIR}/include/myx/core)
diff --git a/src/myx/core/CMakeLists.txt b/src/myx/core/CMakeLists.txt
index 8c6a34a..c4eef63 100644
--- a/src/myx/core/CMakeLists.txt
+++ b/src/myx/core/CMakeLists.txt
@@ -36,8 +36,6 @@ add_format_sources(${TRGT} ${TRGT_cpp} ${TRGT_headers})
 target_include_directories(${TRGT} INTERFACE ${CMAKE_SOURCE_DIR}/src)
 
 generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES})
-install(FILES ${TRGT_headers} ${CMAKE_BINARY_DIR}/include/myx/core/compiler_features.hpp COMPONENT base-dev
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT})
 
 # Цель, используемая только для установки заголовочных файлов без компиляции проекта
 add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base-dev -P