From 23bd5660fd12aba86ba67e9ef031a0c74568e20e Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Wed, 2 Nov 2022 10:19:54 +0300
Subject: [PATCH] 2.1.95

---
 MyxCMake/MyxCMakeConfigVersion.cmake | 2 +-
 MyxCMake/lib/AddSaprBlock.cmake      | 2 --
 MyxCMake/lib/Uninstall.cmake         | 2 +-
 README.md                            | 2 +-
 VERSION                              | 2 +-
 debian/CMakeLists.txt                | 2 +-
 debian/changelog                     | 2 +-
 myx_setup.cmake                      | 4 ++--
 8 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake
index 276ccac..15c2234 100644
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.1.94")
+set(MYX_CMAKE_PACKAGE_VERSION "2.1.95")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
diff --git a/MyxCMake/lib/AddSaprBlock.cmake b/MyxCMake/lib/AddSaprBlock.cmake
index e08a270..36f1aec 100644
--- a/MyxCMake/lib/AddSaprBlock.cmake
+++ b/MyxCMake/lib/AddSaprBlock.cmake
@@ -51,6 +51,4 @@ function(myx_add_sapr_block TARGET_NAME)
   if (NOT WIN32)
     set_target_properties(${TARGET_NAME} PROPERTIES LINK_FLAGS "-Wl,-rpath,$ORIGIN")
   endif()
-
-  set(SAPR_BLOCK_TARGET_EXISTS ON)
 endfunction()
diff --git a/MyxCMake/lib/Uninstall.cmake b/MyxCMake/lib/Uninstall.cmake
index 2b1105b..fd66056 100644
--- a/MyxCMake/lib/Uninstall.cmake
+++ b/MyxCMake/lib/Uninstall.cmake
@@ -6,7 +6,7 @@
 
 include_guard(GLOBAL)
 
-if((NOT TARGET uninstall) AND (NOT SAPR_BLOCK_TARGET_EXISTS))
+if((NOT TARGET uninstall) AND (NOT DEFINED ENV{SAPR_PREFIX}))
   configure_file(${CMAKE_CURRENT_LIST_DIR}/uninstall.cmake.in
                  ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake IMMEDIATE @ONLY)
   add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake)
diff --git a/README.md b/README.md
index c039746..3249051 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.1.94/myx-cmake-local-2.1.94.tar.xz ).
+[архив](../../../releases/download/2.1.95/myx-cmake-local-2.1.95.tar.xz ).
 
 ## Использование
 
diff --git a/VERSION b/VERSION
index 9b218e8..7a4e91e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.94
+2.1.95
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index 88bebc7..a399df5 100644
--- a/debian/CMakeLists.txt
+++ b/debian/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-project(myx-cmake VERSION 2.1.94 LANGUAGES)
+project(myx-cmake VERSION 2.1.95 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
diff --git a/debian/changelog b/debian/changelog
index 66feaf8..4f97b85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-myx-cmake (2.1.94) unstable; urgency=medium
+myx-cmake (2.1.95) unstable; urgency=medium
 
   * New version.
 
diff --git a/myx_setup.cmake b/myx_setup.cmake
index 8a103da..428b10a 100644
--- a/myx_setup.cmake
+++ b/myx_setup.cmake
@@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR})
   set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
 endif()
 if(MYX_CMAKE_DIR)
-  find_package(MyxCMake 2.1.94 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.1.95 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
   myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
 else()
   if(MYX_CMAKE_USE_SYSTEM)
-    find_package(MyxCMake 2.1.94 REQUIRED)
+    find_package(MyxCMake 2.1.95 REQUIRED)
     myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)