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)