cmake/myx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

2.1.100

Browse Source
This commit is contained in:
Andrei Astafev
2022-11-02 17:39:45 +03:00
parent fba519c288
commit 515eeb4b11
7 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MyxCMake/MyxCMakeConfigVersion.cmake
View File

@@ -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) if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE) set(PACKAGE_VERSION_COMPATIBLE FALSE)
else() else()

6
MyxCMake/lib/AddSaprBlock.cmake
View File

@@ -30,6 +30,8 @@ function(myx_add_sapr_block TARGET_NAME)
add_library(${TARGET_NAME} SHARED ${ARG_UNPARSED_ARGUMENTS}) add_library(${TARGET_NAME} SHARED ${ARG_UNPARSED_ARGUMENTS})
else() else()
add_library(${TARGET_NAME} STATIC ${ARG_UNPARSED_ARGUMENTS}) add_library(${TARGET_NAME} STATIC ${ARG_UNPARSED_ARGUMENTS})
set_target_properties(${TARGET_NAME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
endif() endif()
# Стандартные пути к заголовочным файлам # Стандартные пути к заголовочным файлам
@@ -52,9 +54,9 @@ function(myx_add_sapr_block TARGET_NAME)
endif() endif()
else() else()
find_package(Python3 REQUIRED COMPONENTS Interpreter Development) 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) find_package(pybind11 REQUIRED)
target_include_directories("${pybind11_INCLUDE_DIR}") target_include_directories(${TARGET_NAME} PRIVATE ${pybind11_INCLUDE_DIR})
target_include_directories(${TARGET_NAME} target_include_directories(${TARGET_NAME}
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/thirdparty/sapr>) PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/thirdparty/sapr>)
target_link_libraries(${TARGET_NAME} PRIVATE pybind11::headers pybind11::pybind11) target_link_libraries(${TARGET_NAME} PRIVATE pybind11::headers pybind11::pybind11)

2
README.md
View File

@@ -3,7 +3,7 @@
## Установка ## Установка
В корневом каталоге проекта создать каталог `cmake` и распаковать в него В корневом каталоге проекта создать каталог `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 ).
## Использование ## Использование

2
VERSION
View File

@@ -1 +1 @@
2.1.99 2.1.100

2
debian/CMakeLists.txt vendored
View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.6 FATAL_ERROR) 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) include(GNUInstallDirs)
file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake file(WRITE ${CMAKE_SOURCE_DIR}/MyxCMake/MyxCMakeConfigVersion.cmake

2
debian/changelog vendored
View File

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

4
myx_setup.cmake
View File

@@ -20,11 +20,11 @@ if(ENV{MYX_CMAKE_DIR})
set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR}) set(MYX_CMAKE_DIR $ENV{MYX_CMAKE_DIR})
endif() endif()
if(MYX_CMAKE_DIR) 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} ===") myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
else() else()
if(MYX_CMAKE_USE_SYSTEM) 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} ===") myx_message_notice("=== MyxCMake directory: ${MyxCMake_CONFIG} ===")
else() else()
include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake) include(${PROJECT_SOURCE_DIR}/cmake/myx/MyxCMakeConfig.cmake)