fixes #681, allow override of library POSTFIX for nested builds
This commit is contained in:
parent
de9c24a025
commit
081cee6207
@ -1029,7 +1029,7 @@ add_library(crypto $<TARGET_OBJECTS:crypto_obj> empty.c)
|
|||||||
export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
|
export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
|
||||||
target_link_libraries(crypto ${PLATFORM_LIBS})
|
target_link_libraries(crypto ${PLATFORM_LIBS})
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION})
|
set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION} PARENT_SCOPE)
|
||||||
endif()
|
endif()
|
||||||
set_target_properties(crypto PROPERTIES
|
set_target_properties(crypto PROPERTIES
|
||||||
OUTPUT_NAME crypto${CRYPTO_POSTFIX}
|
OUTPUT_NAME crypto${CRYPTO_POSTFIX}
|
||||||
|
@ -87,7 +87,7 @@ endif()
|
|||||||
export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
|
export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
|
||||||
target_link_libraries(ssl crypto ${PLATFORM_LIBS})
|
target_link_libraries(ssl crypto ${PLATFORM_LIBS})
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(SSL_POSTFIX -${SSL_MAJOR_VERSION})
|
set(SSL_POSTFIX -${SSL_MAJOR_VERSION} PARENT_SCOPE)
|
||||||
endif()
|
endif()
|
||||||
set_target_properties(ssl PROPERTIES
|
set_target_properties(ssl PROPERTIES
|
||||||
OUTPUT_NAME ssl${SSL_POSTFIX}
|
OUTPUT_NAME ssl${SSL_POSTFIX}
|
||||||
|
@ -54,7 +54,7 @@ add_library(tls $<TARGET_OBJECTS:tls_obj> $<TARGET_OBJECTS:ssl_obj>
|
|||||||
export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym)
|
export_symbol(tls ${CMAKE_CURRENT_BINARY_DIR}/tls.sym)
|
||||||
target_link_libraries(tls ${PLATFORM_LIBS})
|
target_link_libraries(tls ${PLATFORM_LIBS})
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(TLS_POSTFIX -${TLS_MAJOR_VERSION})
|
set(TLS_POSTFIX -${TLS_MAJOR_VERSION} PARENT_SCOPE)
|
||||||
endif()
|
endif()
|
||||||
set_target_properties(tls PROPERTIES
|
set_target_properties(tls PROPERTIES
|
||||||
OUTPUT_NAME tls${TLS_POSTFIX}
|
OUTPUT_NAME tls${TLS_POSTFIX}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user