diff --git a/MyxCMake/MyxCMakeConfigVersion.cmake b/MyxCMake/MyxCMakeConfigVersion.cmake index 26e5983..10fe1ff 100644 --- a/MyxCMake/MyxCMakeConfigVersion.cmake +++ b/MyxCMake/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "2.1.97") +set(MYX_CMAKE_PACKAGE_VERSION "2.1.98") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/MyxCMake/lib/AddObjectLibrary.cmake b/MyxCMake/lib/AddObjectLibrary.cmake index 26fcaa0..9eab649 100644 --- a/MyxCMake/lib/AddObjectLibrary.cmake +++ b/MyxCMake/lib/AddObjectLibrary.cmake @@ -31,15 +31,11 @@ function(myx_add_object_library TARGET_NAME) set(CMAKE_CURRENT_FUNCTION_LIST_DIR ${MYX_CMAKE_LIB_DIR_BACKPORT}) endif() - set(options SAPR) + set(options) set(oneValueArgs OUTPUT_NAME EXPORT_FILE_NAME EXPORT_BASE_NAME) set(multiValueArgs) cmake_parse_arguments(ARG "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if(ENABLE_SAPR) - set(ARG_SAPR ON) - endif() - if(NOT ARG_OUTPUT_NAME) set(ARG_OUTPUT_NAME ${TARGET_NAME}) endif() @@ -68,7 +64,7 @@ function(myx_add_object_library TARGET_NAME) $ ) - if(ARG_SAPR) + if(ENABLE_SAPR_BLOCK_MODE) target_compile_definitions(${TARGET_NAME} PUBLIC BLOCK_TARGET_MARK) if(DEFINED ENV{SAPR_PREFIX}) if(NOT WIN32) @@ -76,7 +72,7 @@ function(myx_add_object_library TARGET_NAME) endif() return() else() - find_package(Python COMPONENTS Interpeter Development) + find_package(Python COMPONENTS Interpreter Development) find_package(pybind11 CONFIG) target_include_directories(${TARGET_NAME} PUBLIC $) diff --git a/README.md b/README.md index 277e81e..824474e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Установка В корневом каталоге проекта создать каталог `cmake` и распаковать в него -[архив](../../../releases/download/2.1.97/myx-cmake-local-2.1.97.tar.xz ). +[архив](../../../releases/download/2.1.98/myx-cmake-local-2.1.98.tar.xz ). ## Использование diff --git a/VERSION b/VERSION index 3611216..b1536eb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.97 +2.1.98 diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt index d30b86e..1ced0c1 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.97 LANGUAGES) +project(myx-cmake VERSION 2.1.98 LANGUAGES) include(GNUInstallDirs) file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake diff --git a/debian/changelog b/debian/changelog index d9e5574..4668865 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -myx-cmake (2.1.97) unstable; urgency=medium +myx-cmake (2.1.98) unstable; urgency=medium * New version. diff --git a/myx_setup.cmake b/myx_setup.cmake index 7325486..f030d13 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.97 REQUIRED CONFIG PATHS ${MYX_CMAKE_DIR} NO_DEFAULT_PATH) + find_package(MyxCMake 2.1.98 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.97 REQUIRED) + find_package(MyxCMake 2.1.98 REQUIRED) myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===") else() include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)