From e5fbb9023546a5e98c832e8596586c71edcc5b2f Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Tue, 21 Apr 2020 12:26:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D1=82=D0=B8=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B8=D1=80=D1=83=D0=B5=D0=BC?=
 =?UTF-8?q?=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMLibCompilerFeaturesHPPGenerate.cmake |  9 ++++++++-
 CMLibConfigHPPGenerate.cmake           | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CMLibCompilerFeaturesHPPGenerate.cmake b/CMLibCompilerFeaturesHPPGenerate.cmake
index d3384b1..462cb4a 100644
--- a/CMLibCompilerFeaturesHPPGenerate.cmake
+++ b/CMLibCompilerFeaturesHPPGenerate.cmake
@@ -1,7 +1,12 @@
 include(WriteCompilerDetectionHeader)
 
+set(OUTPUT_FILE ${CMAKE_BINARY_DIR}/include/compiler_features.hpp)
+if(CMLIB_GENERATED_HEADERS_PATH)
+  set(OUTPUT_FILE ${CMLIB_GENERATED_HEADERS_PATH}/compiler_features.hpp)
+endif()
+
 write_compiler_detection_header(
-  FILE include/compiler_features.hpp
+  FILE ${OUTPUT_FILE}
   PREFIX ${CMLIB_PROJECT_NAME_CANONICAL}
   COMPILERS GNU Clang MSVC Intel
   FEATURES
@@ -14,3 +19,5 @@ write_compiler_detection_header(
     cxx_constexpr
     cxx_digit_separators
     cxx_range_for)
+
+unset(OUTPUT_FILE)
diff --git a/CMLibConfigHPPGenerate.cmake b/CMLibConfigHPPGenerate.cmake
index 0e6ab24..090a65f 100644
--- a/CMLibConfigHPPGenerate.cmake
+++ b/CMLibConfigHPPGenerate.cmake
@@ -2,7 +2,13 @@ function(cmlib_config_hpp_generate)
   include(CMLibLargeFiles)
   cmlib_test_large_files(HAVE_LARGEFILES)
 
+  set(OUTPUT_FILE ${CMAKE_BINARY_DIR}/include/cmlib_private_config.hpp)
+  if(CMLIB_GENERATED_HEADERS_PATH)
+    set(OUTPUT_FILE ${CMLIB_GENERATED_HEADERS_PATH}/cmlib_private_config.hpp)
+  elseif(ARGV0)
+    set(OUTPUT_FILE ${ARGV0})
+  endif()
+
   get_property(PROJECT_VERSION_INT GLOBAL PROPERTY PROJECT_VERSION_INT)
-  configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_private_config.hpp.in
-                 ${CMAKE_BINARY_DIR}/include/cmlib_private_config.hpp)
+  configure_file(${CMLIB_MODULE_DIR}/hpp/cmlib_private_config.hpp.in ${OUTPUT_FILE})
 endfunction()