From 8114675c1c182ad01f04d9e937854a36aff59551 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 18 Jun 2021 00:59:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D1=91=D0=BD=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B4=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8C=20cmake/doc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 --- CMakeLists.txt | 3 ++- cmake/cmlib | 2 +- cmake/doc | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) delete mode 160000 cmake/doc diff --git a/.gitmodules b/.gitmodules index 9834bfb..6c3ddd7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,3 @@ [submodule "cmake/generators"] path = cmake/generators url = ../../f1x1t/cmake-generators -[submodule "cmake/doc"] - path = cmake/doc - url = ../../f1x1t/cmake-doc diff --git a/CMakeLists.txt b/CMakeLists.txt index c5ecbb5..fe02071 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,4 +62,5 @@ if(MYXLIB_BUILD_EXAMPLES) endif() # Документация -add_subdirectory(cmake/doc) +add_breathe_target(doc-breathe) +add_doxygen_target(doc-doxygen LATEX YES HTML YES) diff --git a/cmake/cmlib b/cmake/cmlib index dbb5704..46e429b 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit dbb57044b415e68761df59a7b2f5cee1bacc2655 +Subproject commit 46e429bf6bb343e91e7d187b25efe72daafd7351 diff --git a/cmake/doc b/cmake/doc deleted file mode 160000 index dc9622f..0000000 --- a/cmake/doc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dc9622f57e78939b5cb482723ddfcef41fccf889