CMakeLists.txt | CMakeLists.txt | |||
---|---|---|---|---|
skipping to change at line 28 | skipping to change at line 28 | |||
) | ) | |||
if (WITH_STATIC_LIB) | if (WITH_STATIC_LIB) | |||
set(LIBSSH_STATIC_LIBRARY | set(LIBSSH_STATIC_LIBRARY | |||
ssh_static | ssh_static | |||
CACHE INTERNAL "libssh static library" | CACHE INTERNAL "libssh static library" | |||
) | ) | |||
endif (WITH_STATIC_LIB) | endif (WITH_STATIC_LIB) | |||
set(LIBSSH_LINK_LIBRARIES | set(LIBSSH_LINK_LIBRARIES | |||
${LIBSSH_REQUIRED_LIBRARIES} | ||||
${ZLIB_LIBRARIES} | ${ZLIB_LIBRARIES} | |||
) | ) | |||
if (WIN32) | if (WIN32) | |||
set(LIBSSH_LINK_LIBRARIES | set(LIBSSH_LINK_LIBRARIES | |||
${LIBSSH_LINK_LIBRARIES} | ${LIBSSH_LINK_LIBRARIES} | |||
ws2_32 | ws2_32 | |||
) | ) | |||
endif (WIN32) | endif (WIN32) | |||
if (HAVE_LIBSOCKET) | ||||
set(LIBSSH_LINK_LIBRARIES | ||||
${LIBSSH_LINK_LIBRARIES} | ||||
socket | ||||
) | ||||
endif (HAVE_LIBSOCKET) | ||||
if (CRYPTO_LIBRARY) | if (CRYPTO_LIBRARY) | |||
set(LIBSSH_PRIVATE_INCLUDE_DIRS | set(LIBSSH_PRIVATE_INCLUDE_DIRS | |||
${LIBSSH_PRIVATE_INCLUDE_DIRS} | ${LIBSSH_PRIVATE_INCLUDE_DIRS} | |||
${OPENSSL_INCLUDE_DIRS} | ${OPENSSL_INCLUDE_DIRS} | |||
) | ) | |||
set(LIBSSH_LINK_LIBRARIES | set(LIBSSH_LINK_LIBRARIES | |||
${LIBSSH_LINK_LIBRARIES} | ${LIBSSH_LINK_LIBRARIES} | |||
${CRYPTO_LIBRARY} | ${CRYPTO_LIBRARY} | |||
) | ) | |||
skipping to change at line 67 | skipping to change at line 75 | |||
${LIBSSH_LINK_LIBRARIES} | ${LIBSSH_LINK_LIBRARIES} | |||
${GCRYPT_LIBRARY} | ${GCRYPT_LIBRARY} | |||
) | ) | |||
endif (GCRYPT_LIBRARY) | endif (GCRYPT_LIBRARY) | |||
set(libssh_SRCS | set(libssh_SRCS | |||
agent.c | agent.c | |||
auth.c | auth.c | |||
base64.c | base64.c | |||
buffer.c | buffer.c | |||
callbacks.c | ||||
channels.c | channels.c | |||
client.c | client.c | |||
config.c | ||||
connect.c | connect.c | |||
crc32.c | crc32.c | |||
crypt.c | crypt.c | |||
dh.c | dh.c | |||
error.c | error.c | |||
gcrypt_missing.c | gcrypt_missing.c | |||
gzip.c | gzip.c | |||
init.c | init.c | |||
kex.c | kex.c | |||
keyfiles.c | keyfiles.c | |||
keys.c | keys.c | |||
log.c | log.c | |||
match.c | match.c | |||
messages.c | messages.c | |||
misc.c | misc.c | |||
options.c | options.c | |||
packet.c | packet.c | |||
poll.c | poll.c | |||
session.c | session.c | |||
scp.c | ||||
socket.c | socket.c | |||
string.c | string.c | |||
wrapper.c | wrapper.c | |||
libssh.map | ||||
) | ) | |||
if (WITH_PCAP) | ||||
set(libssh_SRCS | ||||
${libssh_SRCS} | ||||
pcap.c | ||||
) | ||||
endif (WITH_PCAP) | ||||
if (WITH_SFTP) | if (WITH_SFTP) | |||
set(libssh_SRCS | set(libssh_SRCS | |||
${libssh_SRCS} | ${libssh_SRCS} | |||
sftp.c | sftp.c | |||
) | ) | |||
if (WITH_SERVER) | if (WITH_SERVER) | |||
set(libssh_SRCS | set(libssh_SRCS | |||
${libssh_SRCS} | ${libssh_SRCS} | |||
sftpserver.c | sftpserver.c | |||
skipping to change at line 141 | skipping to change at line 159 | |||
set_target_properties( | set_target_properties( | |||
${LIBSSH_SHARED_LIBRARY} | ${LIBSSH_SHARED_LIBRARY} | |||
PROPERTIES | PROPERTIES | |||
VERSION | VERSION | |||
${LIBRARY_VERSION} | ${LIBRARY_VERSION} | |||
SOVERSION | SOVERSION | |||
${LIBRARY_SOVERSION} | ${LIBRARY_SOVERSION} | |||
OUTPUT_NAME | OUTPUT_NAME | |||
ssh | ssh | |||
DEFINE_SYMBOL | ||||
LIBSSH_EXPORTS | ||||
) | ) | |||
if (WITH_VISIBILITY_HIDDEN) | ||||
set_target_properties(${LIBSSH_SHARED_LIBRARY} PROPERTIES COMPILE_FLAGS " | ||||
-fvisibility=hidden") | ||||
endif (WITH_VISIBILITY_HIDDEN) | ||||
install( | install( | |||
TARGETS | TARGETS | |||
${LIBSSH_SHARED_LIBRARY} | ${LIBSSH_SHARED_LIBRARY} | |||
DESTINATION | RUNTIME DESTINATION ${BIN_INSTALL_DIR} | |||
${LIB_INSTALL_DIR} | LIBRARY DESTINATION ${LIB_INSTALL_DIR} | |||
COMPONENT | ARCHIVE DESTINATION ${LIB_INSTALL_DIR} | |||
libraries | COMPONENT libraries | |||
) | ) | |||
if (WITH_STATIC_LIB) | if (WITH_STATIC_LIB) | |||
add_library(${LIBSSH_STATIC_LIBRARY} STATIC ${libssh_SRCS}) | add_library(${LIBSSH_STATIC_LIBRARY} STATIC ${libssh_SRCS}) | |||
target_link_libraries(${LIBSSH_STATIC_LIBRARY} ${LIBSSH_LINK_LIBRARIES}) | ||||
set_target_properties( | set_target_properties( | |||
${LIBSSH_STATIC_LIBRARY} | ${LIBSSH_STATIC_LIBRARY} | |||
PROPERTIES | PROPERTIES | |||
VERSION | VERSION | |||
${LIBRARY_VERSION} | ${LIBRARY_VERSION} | |||
SOVERSION | SOVERSION | |||
${LIBRARY_SOVERSION} | ${LIBRARY_SOVERSION} | |||
OUTPUT_NAME | COMPILE_FLAGS | |||
ssh | "-DLIBSSH_STATIC" | |||
) | ) | |||
install( | install( | |||
TARGETS | TARGETS | |||
${LIBSSH_STATIC_LIBRARY} | ${LIBSSH_STATIC_LIBRARY} | |||
DESTINATION | DESTINATION | |||
${LIB_INSTALL_DIR} | ${LIB_INSTALL_DIR} | |||
COMPONENT | COMPONENT | |||
libraries | libraries | |||
) | ) | |||
End of changes. 12 change blocks. | ||||
9 lines changed or deleted | 32 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |