Обновление

This commit is contained in:
Andrei Astafev 2022-10-01 17:02:15 +03:00
parent 547ed6d0f1
commit d61dde9ed2

View File

@ -11,6 +11,8 @@ function(myx_install_library NAME)
return() return()
endif() endif()
get_target_property(type ${NAME} TYPE)
write_basic_package_version_file( write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/${NAME}ConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/${NAME}ConfigVersion.cmake
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
@ -43,12 +45,12 @@ function(myx_install_library NAME)
COMPONENT dev COMPONENT dev
) )
if(${type} STREQUAL "OBJECT_LIBRARY")
if(TARGET ${NAME}_shared) if(TARGET ${NAME}_shared)
install( install(
TARGETS ${NAME}_shared TARGETS ${NAME}_shared
EXPORT ${NAME}Targets EXPORT ${NAME}Targets
LIBRARY LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT lib COMPONENT lib
) )
endif() endif()
@ -57,8 +59,16 @@ function(myx_install_library NAME)
install( install(
TARGETS ${NAME}_static TARGETS ${NAME}_static
EXPORT ${NAME}Targets EXPORT ${NAME}Targets
ARCHIVE ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib
)
endif()
endif()
if(${type} STREQUAL "INTERFACE_LIBRARY")
install(
TARGETS ${NAME}
EXPORT ${NAME}Targets
COMPONENT lib COMPONENT lib
) )
endif() endif()