From c0ee1985f81191795be7864cdb249513ee8c9c77 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 26 Jan 2022 09:58:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D1=83=D0=BB=D0=B5=D0=B9=20=D0=B2=20=D0=9E=D0=A1=20?= =?UTF-8?q?=D0=90=D1=81=D1=82=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- MyxCMake/modules/MyxCMakeCommon.cmake | 1 + MyxCMake/modules/MyxCMakePaths.cmake | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 MyxCMake/modules/MyxCMakePaths.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 6328eff..533298a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -project(myx-cmake VERSION 0.5.0 LANGUAGES) +project(myx-cmake VERSION 0.5.1 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/MyxCMake/modules/MyxCMakeCommon.cmake b/MyxCMake/modules/MyxCMakeCommon.cmake index ca700d7..00d6120 100644 --- a/MyxCMake/modules/MyxCMakeCommon.cmake +++ b/MyxCMake/modules/MyxCMakeCommon.cmake @@ -14,6 +14,7 @@ include(MyxCMakeGlobalFunctions) include(MyxCMakeGlobalVariables) include(MyxCMakeDates) include(MyxCMakeLSBInfo) +include(MyxCMakePaths) include(MyxCMakeCompiler) include(MyxCMakeCompilerFlags) include(MyxCMakeDistCC) diff --git a/MyxCMake/modules/MyxCMakePaths.cmake b/MyxCMake/modules/MyxCMakePaths.cmake new file mode 100644 index 0000000..33419a0 --- /dev/null +++ b/MyxCMake/modules/MyxCMakePaths.cmake @@ -0,0 +1,9 @@ +if(MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE" OR + MYX_CMAKE_LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxCE") + set(CMAKE_37_MODULES_DIR "/usr/share/cmake-3.7/Modules") + if(IS_DIRECTORY ${CMAKE_37_MODULES_DIR}) + if(NOT ${CMAKE_37_MODULES_DIR} IN_LIST CMAKE_MODULE_PATH) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_37_MODULES_DIR}) + endif() + endif() +endif()