From 515eeb4b11b12b8d5ae20f35cbcb41562e507a43 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Wed, 2 Nov 2022 17:39:45 +0300
Subject: [PATCH] 2.1.100

---
 MyxCMake/MyxCMakeConfigVersion.cmake | 2 +-
 MyxCMake/lib/AddSaprBlock.cmake      | 6 ++++--
 README.md                            | 2 +-
 VERSION                              | 2 +-
 debian/CMakeLists.txt                | 2 +-
 debian/changelog                     | 2 +-
 myx_setup.cmake                      | 4 ++--
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake
index d8ec21a..d48d719 100644
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.1.99")
+set(MYX_CMAKE_PACKAGE_VERSION "2.1.100")
 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 99c7dfe..3bf97a5 100644
--- a/MyxCMake/lib/AddSaprBlock.cmake
+++ b/MyxCMake/lib/AddSaprBlock.cmake
@@ -30,6 +30,8 @@ function(myx_add_sapr_block TARGET_NAME)
     add_library(${TARGET_NAME} SHARED ${ARG_UNPARSED_ARGUMENTS})
   else()
     add_library(${TARGET_NAME} STATIC ${ARG_UNPARSED_ARGUMENTS})
+    set_target_properties(${TARGET_NAME} PROPERTIES
+      ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
   endif()
 
   # Стандартные пути к заголовочным файлам
@@ -52,9 +54,9 @@ function(myx_add_sapr_block TARGET_NAME)
     endif()
   else()
     find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
-    target_include_directories(${TARGET_NAME} ${Python3_INCLUDE_DIRS})
+    target_include_directories(${TARGET_NAME} PRIVATE ${Python3_INCLUDE_DIRS})
     find_package(pybind11 REQUIRED)
-    target_include_directories("${pybind11_INCLUDE_DIR}")
+    target_include_directories(${TARGET_NAME} PRIVATE ${pybind11_INCLUDE_DIR})
     target_include_directories(${TARGET_NAME}
       PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/thirdparty/sapr>)
     target_link_libraries(${TARGET_NAME} PRIVATE pybind11::headers pybind11::pybind11)
diff --git a/README.md b/README.md
index 3998f67..93fc449 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.1.99/myx-cmake-local-2.1.99.tar.xz ).
+[архив](../../../releases/download/2.1.100/myx-cmake-local-2.1.100.tar.xz ).
 
 ## Использование
 
diff --git a/VERSION b/VERSION
index 7607b4e..1ff62c7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.99
+2.1.100
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index 16afdd0..7ecb354 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.99 LANGUAGES)
+project(myx-cmake VERSION 2.1.100 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
diff --git a/debian/changelog b/debian/changelog
index 4da6f12..7641547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-myx-cmake (2.1.99) unstable; urgency=medium
+myx-cmake (2.1.100) unstable; urgency=medium
 
   * New version.
 
diff --git a/myx_setup.cmake b/myx_setup.cmake
index 19b78e5..e00f5de 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.99 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.1.100 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.99 REQUIRED)
+    find_package(MyxCMake 2.1.100 REQUIRED)
     myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)