From 9cf95c0859377cb08b091ae2f5fba84bb216cd67 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Thu, 29 Sep 2022 14:34:59 +0300
Subject: [PATCH] 1.99.5

---
 MyxCMakeConfigVersion.cmake      | 2 +-
 README.md                        | 2 +-
 config/Globals.cmake             | 6 +++---
 lib/InstallLibrary.cmake         | 8 +++++++-
 lib/SemanticProjectVersion.cmake | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/MyxCMakeConfigVersion.cmake b/MyxCMakeConfigVersion.cmake
index 3e34570..ce76249 100644
--- a/MyxCMakeConfigVersion.cmake
+++ b/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "1.99.4")
+set(MYX_CMAKE_PACKAGE_VERSION "1.99.5")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
diff --git a/README.md b/README.md
index d2f08cb..32c3a9a 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,6 @@
 `project` добавить строку:
 
 ```cmake
-find_package(MyxCMake 1.99.4 PATHS cmake/myx NO_DEFAULT_PATH QUIET REQUIRED)
+find_package(MyxCMake 1.99.5 PATHS cmake/myx NO_DEFAULT_PATH QUIET REQUIRED)
 ```
 
diff --git a/config/Globals.cmake b/config/Globals.cmake
index 249e641..239ce77 100644
--- a/config/Globals.cmake
+++ b/config/Globals.cmake
@@ -1,8 +1,8 @@
 include(GNUInstallDirs)
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
+#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
+#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
+#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
 
 #set(MYX_CMAKE_SCRIPTS_PREFIX ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} PARENT_SCOPE)
 
diff --git a/lib/InstallLibrary.cmake b/lib/InstallLibrary.cmake
index f829908..080b00d 100644
--- a/lib/InstallLibrary.cmake
+++ b/lib/InstallLibrary.cmake
@@ -1,3 +1,9 @@
+include_guard(GLOBAL)
+
+if(${CMAKE_VERSION} VERSION_LESS "3.17.0")
+  set(CMAKE_CURRENT_FUNCTION_LIST_DIR "${CMAKE_CURRENT_LIST_DIR}")
+endif()
+
 include(CMakePackageConfigHelpers)
 
 function(myx_install_library)
@@ -8,7 +14,7 @@ function(myx_install_library)
   )
 
   configure_package_config_file(
-    ${CMAKE_CURRENT_LIST_DIR}/InstallLibraryConfig.cmake.in
+    ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/InstallLibraryConfig.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
     INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
     NO_SET_AND_CHECK_MACRO
diff --git a/lib/SemanticProjectVersion.cmake b/lib/SemanticProjectVersion.cmake
index d40dbc8..4d410e6 100644
--- a/lib/SemanticProjectVersion.cmake
+++ b/lib/SemanticProjectVersion.cmake
@@ -14,4 +14,4 @@ function(myx_project_version_int)
   # cmake-format: on
 endfunction()
 
-myx_project_version_int()
+myx_is_semantic_project_version()