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()