From 37d9eab85b29b838397355b8ccbdc15d627aa1c1 Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Wed, 2 Nov 2022 11:05:10 +0300
Subject: [PATCH] 2.1.96

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

diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake
index 15c2234..84be00f 100644
--- a/MyxCMake/MyxCMakeConfigVersion.cmake
+++ b/MyxCMake/MyxCMakeConfigVersion.cmake
@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.1.95")
+set(MYX_CMAKE_PACKAGE_VERSION "2.1.96")
 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 36f1aec..dffb595 100644
--- a/MyxCMake/lib/AddSaprBlock.cmake
+++ b/MyxCMake/lib/AddSaprBlock.cmake
@@ -42,6 +42,14 @@ function(myx_add_sapr_block TARGET_NAME)
       $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
   )
 
+  if(NOT DEFINED ENV{SAPR_PREFIX})
+    find_package(Python COMPONENTS Interpeter Development)
+    find_package(pybind11 CONFIG)
+    target_include_directories(${TARGET_NAME}
+      PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/thirdparty/sapr>)
+    target_link_libraries(${TARGET_NAME} PRIVATE pybind11::headers pybind11::pybind11)
+  endif()
+
   # Сборка позиционно-независимых объектных файлов нужна
   # для создания динамической библиотеки
   set_target_properties(${TARGET_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
diff --git a/README.md b/README.md
index 3249051..5b89ba8 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.1.95/myx-cmake-local-2.1.95.tar.xz ).
+[архив](../../../releases/download/2.1.96/myx-cmake-local-2.1.96.tar.xz ).
 
 ## Использование
 
diff --git a/VERSION b/VERSION
index 7a4e91e..613f02e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.95
+2.1.96
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index a399df5..32d6059 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.95 LANGUAGES)
+project(myx-cmake VERSION 2.1.96 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake
diff --git a/debian/changelog b/debian/changelog
index 4f97b85..723d0b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-myx-cmake (2.1.95) unstable; urgency=medium
+myx-cmake (2.1.96) unstable; urgency=medium
 
   * New version.
 
diff --git a/myx_setup.cmake b/myx_setup.cmake
index 428b10a..d8cb845 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.95 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.1.96 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.95 REQUIRED)
+    find_package(MyxCMake 2.1.96 REQUIRED)
     myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)