2.1.100

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()

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)

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 ).
 
 ## Использование
 

VERSION

@@ -1 +1 @@
-2.1.99
+2.1.100

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

debian/changelog

@@ -1,4 +1,4 @@
-myx-cmake (2.1.99) unstable; urgency=medium
+myx-cmake (2.1.100) 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.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)