2.2.0

MyxCMake/MyxCMakeConfigVersion.cmake

@@ -1,4 +1,4 @@
-set(MYX_CMAKE_PACKAGE_VERSION "2.1.100")
+set(MYX_CMAKE_PACKAGE_VERSION "2.2.0")
 if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()

MyxCMake/lib/AddSaprBlock.cmake

@@ -59,6 +59,10 @@ function(myx_add_sapr_block TARGET_NAME)
     target_include_directories(${TARGET_NAME} PRIVATE ${pybind11_INCLUDE_DIR})
     target_include_directories(${TARGET_NAME}
       PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/thirdparty/sapr>)
+    if(pybind11_VERSION VERSION_LESS "2.5.0")
+      target_link_libraries(${TARGET_NAME} PRIVATE pybind11::module)
+    else()
       target_link_libraries(${TARGET_NAME} PRIVATE pybind11::headers pybind11::pybind11)
     endif()
+  endif()
 endfunction()

README.md

@@ -3,7 +3,7 @@
 ## Установка
 
 В корневом каталоге проекта создать каталог `cmake` и распаковать в него
-[архив](../../../releases/download/2.1.100/myx-cmake-local-2.1.100.tar.xz ).
+[архив](../../../releases/download/2.2.0/myx-cmake-local-2.2.0.tar.xz ).
 
 ## Использование
 

VERSION

@@ -1 +1 @@
-2.1.100
+2.2.0

debian/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6 FATAL_ERROR)
-project(myx-cmake VERSION 2.1.100 LANGUAGES)
+project(myx-cmake VERSION 2.2.0 LANGUAGES)
 
 include(GNUInstallDirs)
 file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

debian/changelog

@@ -1,4 +1,4 @@
-myx-cmake (2.1.100) unstable; urgency=medium
+myx-cmake (2.2.0) unstable; urgency=medium
 
   * New version.
 

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.100 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH)
+  find_package(MyxCMake 2.2.0 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.100 REQUIRED)
+    find_package(MyxCMake 2.2.0 REQUIRED)
     myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
   else()
     include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)