Compare commits

..

No commits in common. "153715dee0f2d4fc4bb494eeacdd0103299c63fc" and "515eeb4b11b12b8d5ae20f35cbcb41562e507a43" have entirely different histories.

7 changed files with 8 additions and 12 deletions

View File

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

View File

@ -59,10 +59,6 @@ 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()
target_link_libraries(${TARGET_NAME} PRIVATE pybind11::headers pybind11::pybind11)
endif()
endfunction()

View File

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

View File

@ -1 +1 @@
2.2.0
2.1.100

View File

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

2
debian/changelog vendored
View File

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

View File

@ -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.2.0 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.2.0 REQUIRED)
find_package(MyxCMake 2.1.100 REQUIRED)
myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)