Добавлен каталог для поиска модулей в ОС Астра
This commit is contained in:
parent
48c480af2e
commit
c0ee1985f8
@ -1,5 +1,5 @@
|
|||||||
cmake_minimum_required(VERSION 3.0)
|
cmake_minimum_required(VERSION 3.0)
|
||||||
project(myx-cmake VERSION 0.5.0 LANGUAGES)
|
project(myx-cmake VERSION 0.5.1 LANGUAGES)
|
||||||
|
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
|
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
|
||||||
|
@ -14,6 +14,7 @@ include(MyxCMakeGlobalFunctions)
|
|||||||
include(MyxCMakeGlobalVariables)
|
include(MyxCMakeGlobalVariables)
|
||||||
include(MyxCMakeDates)
|
include(MyxCMakeDates)
|
||||||
include(MyxCMakeLSBInfo)
|
include(MyxCMakeLSBInfo)
|
||||||
|
include(MyxCMakePaths)
|
||||||
include(MyxCMakeCompiler)
|
include(MyxCMakeCompiler)
|
||||||
include(MyxCMakeCompilerFlags)
|
include(MyxCMakeCompilerFlags)
|
||||||
include(MyxCMakeDistCC)
|
include(MyxCMakeDistCC)
|
||||||
|
9
MyxCMake/modules/MyxCMakePaths.cmake
Normal file
9
MyxCMake/modules/MyxCMakePaths.cmake
Normal file
@ -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()
|
Loading…
Reference in New Issue
Block a user