From c8acc9c4156d9dedde16aa2dd03e130c7fc9dba6 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Fri, 2 Jul 2021 10:57:21 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                   | 8 ++------
 src/cmlib-example/CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28cc965..ef3d9d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(cmlib-example-app-qt5-con VERSION 0.2.0 LANGUAGES C CXX)
 set(CMLIB_ORGANIZATION_NAME "ECS5" CACHE STRING "")
 set(CMLIB_AUTHOR_NAME "Андрей Астафьев" CACHE STRING "")
 set(CMLIB_AUTHOR_EMAIL "dev@246060.ru" CACHE STRING "")
-set(CMLIB_DESCRIPTION "Пример проекта: приложение Qt5" CACHE STRING "")
+set(CMLIB_DESCRIPTION "Пример проекта: консольное приложение Qt5" CACHE STRING "")
 
 # В каталоге cmake/cmlib находятся файлы с библиотечными функциями
 if(NOT DEFINED CMLIB_MAIN_DIR)
@@ -45,11 +45,7 @@ ExternalProject_Add(
   SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myxlib
   INSTALL_DIR ${CMAKE_BINARY_DIR}
   DOWNLOAD_COMMAND ""
-  CONFIGURE_COMMAND
-    ${CMAKE_COMMAND} -"G${CMAKE_GENERATOR}" -DCMAKE_BUILD_TYPE=Debug
-    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-    -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR} <SOURCE_DIR>
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" ${CMLIB_EXT_PROJ_DEFAULT_ARGS} <SOURCE_DIR>
   BUILD_COMMAND true)
 
 # Приложение
diff --git a/src/cmlib-example/CMakeLists.txt b/src/cmlib-example/CMakeLists.txt
index dd2c257..38d3ba4 100644
--- a/src/cmlib-example/CMakeLists.txt
+++ b/src/cmlib-example/CMakeLists.txt
@@ -43,4 +43,4 @@ target_link_libraries(${TRGT} myx-qt myx-filesystem)
 set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME ${TRGT})
 
 # Правила для установки
-install(TARGETS ${TRGT} COMPONENT MAIN RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS ${TRGT} COMPONENT main RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})