From f095753fa6b59799ba014a068e5e059dcfb8ec84 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 4 Oct 2019 14:02:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=BC=D1=8F=20=D0=B2=D1=8B=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B0?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE?= =?UTF-8?q?=D1=82=D0=B5=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibCommonLibraryTarget.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CMLibCommonLibraryTarget.cmake b/CMLibCommonLibraryTarget.cmake index 9100e0c..4b26394 100644 --- a/CMLibCommonLibraryTarget.cmake +++ b/CMLibCommonLibraryTarget.cmake @@ -1,13 +1,19 @@ # Создание статической и динамической библиотеки из одинаковых объектных файлов function(add_common_library) set(options) - set(oneValueArgs TARGET) + set(oneValueArgs TARGET OUTPUT_NAME) set(multiValueArgs SOURCES) cmake_parse_arguments(_LOCAL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) set(LIBNAME ${_LOCAL_TARGET}) set(SOURCES ${_LOCAL_SOURCES}) + if (${_LOCAL_OUTPUT_NAME}) + set(OUTNAME ${_LOCAL_OUTPUT_NAME}) + else() + set(OUTNAME ${LIBNAME}) + endif() + add_library(${LIBNAME} OBJECT ${SOURCES}) target_include_directories( ${LIBNAME} @@ -22,7 +28,7 @@ function(add_common_library) PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR} - OUTPUT_NAME ${LIBNAME} + OUTPUT_NAME ${OUTNAME} LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}) install(TARGETS ${LIBNAME}_shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() @@ -31,7 +37,7 @@ function(add_common_library) add_library(${LIBNAME}_static STATIC $) set_target_properties(${LIBNAME}_static PROPERTIES - OUTPUT_NAME ${LIBNAME} + OUTPUT_NAME ${OUTNAME} ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_INSTALL_LIBDIR}) install(TARGETS ${LIBNAME}_static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif()