Чистка кода

2021-12-09 14:41:26 +03:00
parent 17daab8623
commit 02b4763525
12 changed files with 92 additions and 69 deletions
--- a/MyxCMake/modules/MyxCMakeCPack.cmake
+++ b/MyxCMake/modules/MyxCMakeCPack.cmake
@@ -63,7 +63,7 @@ if(MYX_CMAKE_CPACK_DEFAULT_SCHEME)
 endif()

 # Правила для сборки пакетов для Debian
-include(CMLibCPackDeb)
+include(MyxCMakeCPackDeb)

 # Подключение модуля, выполняющего сборку архивов и пакетов
 include(CPack)
--- a/MyxCMake/modules/MyxCMakeCommon.cmake
+++ b/MyxCMake/modules/MyxCMakeCommon.cmake
@@ -32,12 +32,20 @@ include(MyxCMakeAddSharedLibrary)
 include(MyxCMakeAddStaticLibrary)
 include(MyxCMakePkgConfig)
 include(MyxCMakeNinjaGeneratorHelper)
-include(CMLibGit)
-
-

 # include(CMLibDocDoxygen) include(CMLibDocBreathe)
 # include(CMLibExternalProject)

 include(MyxCMakeCPack)
 include(MyxCMakeUninstall)
+
+
+# Additional functions
+include(MyxCMakeGenerateGitInfoHeader)
+include(MyxCMakeGeneratePrivateConfigHeader)
+include(MyxCMakeHighPrecisionMath)
+include(MyxCMakeLargeFiles)
+include(MyxCMakeQtTranslation)
+include(MyxCMakeRemoveFlag)
+include(MyxCMakeWriteCompilerDetectionHeader)
+
--- a/MyxCMake/modules/MyxCMakeUninstall.cmake
+++ b/MyxCMake/modules/MyxCMakeUninstall.cmake
@@ -1,5 +1,5 @@
 if(NOT TARGET uninstall)
-  configure_file("${CMAKE_CURRENT_LIST_DIR}/CMLibUninstall.cmake.in"
+  configure_file("${CMAKE_CURRENT_LIST_DIR}/MyxCMakeUninstall.cmake.in"
                 "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)

  add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake)