1.99.7
This commit is contained in:
@ -12,12 +12,6 @@ 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)
|
||||
@ -27,6 +21,12 @@ function(myx_add_library)
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||
)
|
||||
else()
|
||||
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)
|
||||
|
||||
target_include_directories(${PROJECT_NAME}
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
|
||||
@ -44,7 +44,7 @@ function(myx_add_library)
|
||||
NO_DEPRECATED_MACRO_NAME "NO_DEPRECATED_${suffix}"
|
||||
NO_EXPORT_MACRO_NAME "NO_EXPORT_${suffix}"
|
||||
STATIC_DEFINE "STATIC_DEFINE_${suffix}"
|
||||
EXPORT_FILE_NAME "${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/export.hpp"
|
||||
EXPORT_FILE_NAME "${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/export_autogen.hpp"
|
||||
DEFINE_NO_DEPRECATED
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user