From aa1f06b306d86241c5bf6229c19ea43631743bd4 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Wed, 22 Apr 2020 22:28:14 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20pkg-config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmake/cmlib                       | 2 +-
 src/myx/base/CMakeLists.txt       | 2 +-
 src/myx/filesystem/CMakeLists.txt | 2 +-
 src/myx/math/CMakeLists.txt       | 2 +-
 src/myx/qt/CMakeLists.txt         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmake/cmlib b/cmake/cmlib
index 197e5b3..ea2b322 160000
--- a/cmake/cmlib
+++ b/cmake/cmlib
@@ -1 +1 @@
-Subproject commit 197e5b3939709a0cc4924e44c355aa8ad7358b8e
+Subproject commit ea2b322df6b3c53b4d9004f5ed945f496c9291c6
diff --git a/src/myx/base/CMakeLists.txt b/src/myx/base/CMakeLists.txt
index 983c142..e607711 100644
--- a/src/myx/base/CMakeLists.txt
+++ b/src/myx/base/CMakeLists.txt
@@ -49,10 +49,10 @@ if(MYXLIB_BUILD_LIBRARIES)
   endif()
 endif()
 
+generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES})
 install(FILES ${TRGT_headers} ${CMAKE_BINARY_DIR}/include/myx/base/compiler_features.hpp COMPONENT headers
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT})
 
-install(FILES ${CMAKE_BINARY_DIR}/${TRGT}.pc COMPONENT headers DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # Цель, используемая только для установки заголовочных файлов без компиляции проекта
 add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=headers -P
diff --git a/src/myx/filesystem/CMakeLists.txt b/src/myx/filesystem/CMakeLists.txt
index 5ac2d98..cd7b40c 100644
--- a/src/myx/filesystem/CMakeLists.txt
+++ b/src/myx/filesystem/CMakeLists.txt
@@ -56,8 +56,8 @@ if(MYXLIB_BUILD_LIBRARIES)
   endif()
 endif()
 
+generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES})
 install(FILES ${TRGT_headers} COMPONENT DEV DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT})
-install(FILES ${CMAKE_BINARY_DIR}/${TRGT}.pc COMPONENT DEV DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # Цель, используемая только для установки заголовочных файлов без компиляции проекта
 add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P
diff --git a/src/myx/math/CMakeLists.txt b/src/myx/math/CMakeLists.txt
index 6cbd061..dba9ad4 100644
--- a/src/myx/math/CMakeLists.txt
+++ b/src/myx/math/CMakeLists.txt
@@ -67,8 +67,8 @@ if(MYXLIB_BUILD_LIBRARIES)
   endif()
 endif()
 
+generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES})
 install(FILES ${TRGT_headers} COMPONENT DEV DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT})
-install(FILES ${CMAKE_BINARY_DIR}/${TRGT}.pc COMPONENT DEV DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # Цель, используемая только для установки заголовочных файлов без компиляции проекта
 add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=DEV -P
diff --git a/src/myx/qt/CMakeLists.txt b/src/myx/qt/CMakeLists.txt
index 83d8878..d908917 100644
--- a/src/myx/qt/CMakeLists.txt
+++ b/src/myx/qt/CMakeLists.txt
@@ -52,9 +52,9 @@ if(MYXLIB_BUILD_LIBRARIES)
   endif()
 endif()
 
+generate_pkgconfig(myx-${TRGT} COMPONENT headers INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES})
 install(FILES ${TRGT_headers} COMPONENT headers
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT})
-install(FILES ${CMAKE_BINARY_DIR}/${TRGT}.pc COMPONENT headers DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # Цель, используемая только для установки заголовочных файлов без компиляции проекта
 add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=headers -P