From 9a6f6d797747eaab482de88634ac3cc65cc9e4cb Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 7 Jun 2021 17:53:30 +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=20CMLib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 8 +++++++- cmake/cmlib | 2 +- cmake/doc | 2 +- cmake/etc/Variables.cmake | 9 --------- cmake/find | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 cmake/etc/Variables.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 24471b3..6588f07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # Минимальная версия CMake -cmake_minimum_required(VERSION 3.3) +cmake_minimum_required(VERSION 3.6) # Предпочтительно следовать стандартам принятым в указанном диапазоне версий cmake_policy(VERSION 3.0.2..3.7) @@ -7,6 +7,12 @@ cmake_policy(VERSION 3.0.2..3.7) # Название и версия проекта и используемые языки программирования project(cmlib-example-base 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 "Пример проекта: начало" CACHE STRING "") + # В каталоге cmake/cmlib находятся файлы с библиотечными функциями if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/cmlib) list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/cmlib) diff --git a/cmake/cmlib b/cmake/cmlib index 197e5b3..bef7660 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 197e5b3939709a0cc4924e44c355aa8ad7358b8e +Subproject commit bef76608367ee504581bf74dd794a135f66691d2 diff --git a/cmake/doc b/cmake/doc index acdfb6a..dc9622f 160000 --- a/cmake/doc +++ b/cmake/doc @@ -1 +1 @@ -Subproject commit acdfb6a9dd5ca1cb037e541f7da7033968873357 +Subproject commit dc9622f57e78939b5cb482723ddfcef41fccf889 diff --git a/cmake/etc/Variables.cmake b/cmake/etc/Variables.cmake deleted file mode 100644 index 63afa33..0000000 --- a/cmake/etc/Variables.cmake +++ /dev/null @@ -1,9 +0,0 @@ -set(ORGANIZATION_NAME "org") -set(AUTHOR_NAME "John Doe") - -set(DOXYGEN_PROJECT_TITLE "Пример проекта (начало)") -set(DOXYGEN_GENERATE_LATEX YES) -set(DOXYGEN_GENERATE_HTML YES) - -set(CPACK_PACKAGE_CONTACT "John Doe ") -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake project example") diff --git a/cmake/find b/cmake/find index d0bc6e7..bb640e3 160000 --- a/cmake/find +++ b/cmake/find @@ -1 +1 @@ -Subproject commit d0bc6e71e9c613eaaecca62eaf445d647f5216ed +Subproject commit bb640e3cf2f287643db784df519d23ddf0a6f1f4