From 8d2dbfec226043d4b0f61803814dd68fe88a27c5 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Sat, 1 Oct 2022 17:02:49 +0300 Subject: [PATCH] update --- cmake/myx/lib/InstallLibrary.cmake | 39 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/cmake/myx/lib/InstallLibrary.cmake b/cmake/myx/lib/InstallLibrary.cmake index 18c8ecd..21296ed 100644 --- a/cmake/myx/lib/InstallLibrary.cmake +++ b/cmake/myx/lib/InstallLibrary.cmake @@ -11,6 +11,8 @@ function(myx_install_library NAME) return() endif() + get_target_property(type ${NAME} TYPE) + write_basic_package_version_file( ${CMAKE_CURRENT_BINARY_DIR}/${NAME}ConfigVersion.cmake VERSION ${PROJECT_VERSION} @@ -30,8 +32,6 @@ function(myx_install_library NAME) COMPONENT dev ) - get_target_property(type ${NAME} TYPE) - install(EXPORT ${NAME}Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${NAME} COMPONENT dev @@ -45,24 +45,24 @@ function(myx_install_library NAME) COMPONENT dev ) - if(TARGET ${NAME}_shared) - install( - TARGETS ${NAME}_shared - EXPORT ${NAME}Targets - LIBRARY - DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT lib - ) - endif() + if(${type} STREQUAL "OBJECT_LIBRARY") + if(TARGET ${NAME}_shared) + install( + TARGETS ${NAME}_shared + EXPORT ${NAME}Targets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT lib + ) + endif() - if(TARGET ${NAME}_static) - install( - TARGETS ${NAME}_static - EXPORT ${NAME}Targets - ARCHIVE - DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT lib - ) + if(TARGET ${NAME}_static) + install( + TARGETS ${NAME}_static + EXPORT ${NAME}Targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT lib + ) + endif() endif() if(${type} STREQUAL "INTERFACE_LIBRARY") @@ -72,5 +72,4 @@ function(myx_install_library NAME) COMPONENT lib ) endif() - endfunction()