From 489fd9fc143546bb4a6a4caaa97b882c6a558f60 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Fri, 6 May 2022 14:19:47 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D1=82=D1=8C=20=D0=BA=20=D0=B0?=
 =?UTF-8?q?=D0=B2=D1=82=D0=BE=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B8=D1=80?=
 =?UTF-8?q?=D1=83=D0=B5=D0=BC=D1=8B=D0=BC=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D1=87=D0=BD=D1=8B=D0=BC=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/MyxCMakeGenerateGitInfoHeader.cmake  | 16 ++++++++--------
 .../MyxCMakeGeneratePrivateConfigHeader.cmake    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/MyxCMake/modules/MyxCMakeGenerateGitInfoHeader.cmake b/MyxCMake/modules/MyxCMakeGenerateGitInfoHeader.cmake
index 9b2a69d..8f45213 100644
--- a/MyxCMake/modules/MyxCMakeGenerateGitInfoHeader.cmake
+++ b/MyxCMake/modules/MyxCMakeGenerateGitInfoHeader.cmake
@@ -2,7 +2,7 @@ include_guard(GLOBAL)
 
 
 function(myx_cmake_generate_git_info_header)
-  set(_filename ${CMAKE_BINARY_DIR}/${CMAKE_INCLUDE_DIR}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_git_info_p.hpp)
+  set(_filename ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_git_info_p.hpp)
   if(MYX_CMAKE_GENERATED_HEADERS_PATH)
     set(_filename ${MYX_CMAKE_GENERATED_HEADERS_PATH}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_git_info_p.hpp)
   elseif(ARGV0)
@@ -56,20 +56,20 @@ if(GIT_EXECUTABLE)
 
   # Check whether we got any revision (which isn't always the case,
   # e.g. when someone downloaded a zip file from Github instead of a checkout)
-  if(NOT ${MYX_CMAKE_GIT_REV} STREQUAL \"\")
+  if(NOT \"\${MYX_CMAKE_GIT_REV}\" STREQUAL \"\")
     execute_process(COMMAND bash -c \"git diff --quiet --exit-code || echo +\" OUTPUT_VARIABLE MYX_CMAKE_GIT_DIFF)
     execute_process(COMMAND git describe --exact-match --tags OUTPUT_VARIABLE MYX_CMAKE_GIT_TAG ERROR_QUIET)
     execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_VARIABLE MYX_CMAKE_GIT_BRANCH)
 
-    string(STRIP \"${MYX_CMAKE_GIT_REV}\" MYX_CMAKE_GIT_REV)
-    string(SUBSTRING \"${MYX_CMAKE_GIT_REV}\" 1 7 MYX_CMAKE_GIT_REV)
-    string(STRIP \"${MYX_CMAKE_GIT_DIFF}\" MYX_CMAKE_GIT_DIFF)
-    string(STRIP \"${MYX_CMAKE_GIT_TAG}\" MYX_CMAKE_GIT_TAG)
-    string(STRIP \"${MYX_CMAKE_GIT_BRANCH}\" MYX_CMAKE_GIT_BRANCH)
+    string(STRIP \"\${MYX_CMAKE_GIT_REV}\" MYX_CMAKE_GIT_REV)
+    string(SUBSTRING \"\${MYX_CMAKE_GIT_REV}\" 1 7 MYX_CMAKE_GIT_REV)
+    string(STRIP \"\${MYX_CMAKE_GIT_DIFF}\" MYX_CMAKE_GIT_DIFF)
+    string(STRIP \"\${MYX_CMAKE_GIT_TAG}\" MYX_CMAKE_GIT_TAG)
+    string(STRIP \"\${MYX_CMAKE_GIT_BRANCH}\" MYX_CMAKE_GIT_BRANCH)
   endif()
 endif()
 
-configure_file(${_git_info_hpp_in_path} ${MYX_CMAKE_GIT_INFO_FILE})
+configure_file(${_git_info_hpp_in_path} \"\${MYX_CMAKE_GIT_INFO_FILE}\")
 ")
   set(_git_info_cmake_in_path ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/MyxCMakeGitInfo.cmake.in)
   file(WRITE ${_git_info_cmake_in_path} ${_git_info_cmake_in})
diff --git a/MyxCMake/modules/MyxCMakeGeneratePrivateConfigHeader.cmake b/MyxCMake/modules/MyxCMakeGeneratePrivateConfigHeader.cmake
index ef68a30..2720c9f 100644
--- a/MyxCMake/modules/MyxCMakeGeneratePrivateConfigHeader.cmake
+++ b/MyxCMake/modules/MyxCMakeGeneratePrivateConfigHeader.cmake
@@ -5,7 +5,7 @@ function(myx_cmake_generate_private_config_header)
   include(MyxCMakeLargeFiles)
   myx_cmake_test_large_files(HAVE_LARGEFILES)
 
-  set(_filename ${CMAKE_BINARY_DIR}/${CMAKE_INCLUDE_DIR}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_private_config_p.hpp)
+  set(_filename ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_private_config_p.hpp)
   if(MYX_CMAKE_GENERATED_HEADERS_PATH)
     set(_filename ${MYX_CMAKE_GENERATED_HEADERS_PATH}/${MYX_CMAKE_PROJECT_NAME_LOWER}/myx_cmake_private_config_p.hpp)
   elseif(ARGV0)