From 1728ffb56d88377ae5770f570a22e6db9297367c Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Thu, 29 Sep 2022 14:57:54 +0300 Subject: [PATCH] 1.99.6 --- MyxCMakeConfigVersion.cmake | 2 +- README.md | 2 +- lib/AddLibrary.cmake | 6 ++++++ lib/InstallLibrary.cmake | 20 ++++++++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/MyxCMakeConfigVersion.cmake b/MyxCMakeConfigVersion.cmake index ce76249..325bb9d 100644 --- a/MyxCMakeConfigVersion.cmake +++ b/MyxCMakeConfigVersion.cmake @@ -1,4 +1,4 @@ -set(MYX_CMAKE_PACKAGE_VERSION "1.99.5") +set(MYX_CMAKE_PACKAGE_VERSION "1.99.6") if(MYX_CMAKE_PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() diff --git a/README.md b/README.md index 32c3a9a..9fc1e47 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,6 @@ `project` добавить строку: ```cmake -find_package(MyxCMake 1.99.5 PATHS cmake/myx NO_DEFAULT_PATH QUIET REQUIRED) +find_package(MyxCMake 1.99.6 PATHS cmake/myx NO_DEFAULT_PATH QUIET REQUIRED) ``` diff --git a/lib/AddLibrary.cmake b/lib/AddLibrary.cmake index c4b78c5..baeea52 100644 --- a/lib/AddLibrary.cmake +++ b/lib/AddLibrary.cmake @@ -12,6 +12,12 @@ function(myx_add_library) set(arg_TYPE "OBJECT") endif() + string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER) + # Опция для разрешения сборки разделяемой библиотеки + option(${PROJECT_NAME_UPPER}_BUILD_SHARED "Build shared library" ON) + # Опция для разрешения сборки статической библиотеки + option(${PROJECT_NAME_UPPER}_BUILD_STATIC "Build static library" ON) + add_library(${PROJECT_NAME} ${arg_TYPE}) if(arg_TYPE STREQUAL INTERFACE) diff --git a/lib/InstallLibrary.cmake b/lib/InstallLibrary.cmake index 080b00d..a1f4af2 100644 --- a/lib/InstallLibrary.cmake +++ b/lib/InstallLibrary.cmake @@ -44,4 +44,24 @@ function(myx_install_library) DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} COMPONENT dev ) + + if(TARGET ${PROJECT_NAME}_shared) + install( + TARGETS ${PROJECT_NAME}_shared + EXPORT ${PROJECT_NAME}Target + LIBRARY + DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT lib + ) + endif() + + if(TARGET ${PROJECT_NAME}_static) + install( + TARGETS ${PROJECT_NAME}_static + EXPORT ${PROJECT_NAME}Target + ARCHIVE + DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT lib + ) + endif() endfunction()