Merge branch 'master' of git.246060.ru:f1x1t/myx-cmake

MyxCMake/modules/MyxCMakeCompilerFlags.cmake

@@ -8,11 +8,11 @@ macro(CHECK_ENABLE_CXX_FLAG flag)
   unset(CMAKE_REQUIRED_QUIET)
 
   if(CHECK_CXX_FLAG)
-    message(STATUS "'${flag}': flag is supported.")
+    myx_cmake_message_notice("'${flag}': flag is supported.")
     string(CONCAT _MYX_CMAKE_DETECTED_CXX_FLAGS
                   "${_MYX_CMAKE_DETECTED_CXX_FLAGS} ${flag}")
   else()
-    message(STATUS "'${flag}': flag is NOT supported.")
+    myx_cmake_message_status("'${flag}': flag is NOT supported.")
   endif()
   # NOTE: check_cxx_compiler stores variables in the cache.
   unset(CHECK_CXX_FLAG CACHE)

MyxCMake/modules/MyxCMakeDistCC.cmake

@@ -2,12 +2,12 @@ find_program(DISTCC_EXECUTABLE distcc)
 mark_as_advanced(DISTCC_EXECUTABLE)
 if(DISTCC_EXECUTABLE)
   foreach(lang C CXX)
-    if(NOT DEFINED CMAKE_${lang}_COMPILER_LAUNCHER
+  # cmake-format: off
-       AND NOT CMAKE_${lang}_COMPILER MATCHES ".*/distcc$")
+    if(NOT DEFINED CMAKE_${lang}_COMPILER_LAUNCHER AND
-      message(STATUS "MyxCMake: distcc enabled for ${lang}")
+       NOT CMAKE_${lang}_COMPILER MATCHES ".*/distcc$")
-      set(CMAKE_${lang}_COMPILER_LAUNCHER
+      myx_cmake_message("MyxCMake: distcc enabled for ${lang}")
-          ${DISTCC_EXECUTABLE}
+      set(CMAKE_${lang}_COMPILER_LAUNCHER ${DISTCC_EXECUTABLE} CACHE STRING "")
-          CACHE STRING "")
     endif()
+  # cmake-format: on
   endforeach()
 endif()