diff options
author | Nicolas Viennot <nicolas@viennot.biz> | 2014-10-31 00:10:02 -0400 |
---|---|---|
committer | Nicolas Viennot <nicolas@viennot.biz> | 2014-10-31 00:30:36 -0400 |
commit | 6e4adcc140102b80883bba85dff05003620b0029 (patch) | |
tree | cf7c368b6dfb57c6c6be8b20bfe75995aae5ff63 | |
parent | 0783022d6d77ab3716e2a754856d40497b4cfd76 (diff) |
Update libssh
136 files changed, 11366 insertions, 6575 deletions
diff --git a/libssh/AUTHORS b/libssh/AUTHORS index fd753860..51b3e46f 100644 --- a/libssh/AUTHORS +++ b/libssh/AUTHORS @@ -1,7 +1,7 @@ Author(s): Aris Adamantiadis <aris@0xbadc0de.be> (project initiator) -Andreas Schneider <mail@cynapses.org> (developer) +Andreas Schneider <asn@cryptomilk.org> (developer) Nick Zitzmann <seiryu (at) comcast (dot) net> (mostly client SFTP stuff) diff --git a/libssh/CMakeLists.txt b/libssh/CMakeLists.txt index 5998bc50..48559f37 100644 --- a/libssh/CMakeLists.txt +++ b/libssh/CMakeLists.txt @@ -7,8 +7,8 @@ cmake_minimum_required(VERSION 2.6.0) set(APPLICATION_NAME ${PROJECT_NAME}) set(APPLICATION_VERSION_MAJOR "0") -set(APPLICATION_VERSION_MINOR "5") -set(APPLICATION_VERSION_PATCH "90") +set(APPLICATION_VERSION_MINOR "7") +set(APPLICATION_VERSION_PATCH "0") set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}") @@ -39,10 +39,6 @@ include(CPackConfig.cmake) include(MacroEnsureOutOfSourceBuild) macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there.") -# add macros -include(MacroAddPlugin) -include(MacroCopyFile) - # search for libraries if (WITH_ZLIB) find_package(ZLIB REQUIRED) @@ -101,18 +97,22 @@ install( ) # cmake config files -configure_file(libssh-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libssh-config.cmake @ONLY) -configure_file(libssh-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libssh-config-version.cmake @ONLY) +set(LIBSSH_LIBRARY_NAME @CMAKE_SHARED_LIBRARY_PREFIX@ssh@CMAKE_SHARED_LIBRARY_SUFFIX@) +set(LIBSSH_THREADS_LIBRARY_NAME @CMAKE_SHARED_LIBRARY_PREFIX@ssh@CMAKE_SHARED_LIBRARY_SUFFIX@) + +configure_file(${PROJECT_NAME}-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake @ONLY) +configure_file(${PROJECT_NAME}-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake @ONLY) install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/libssh-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/libssh-config-version.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake DESTINATION - ${CMAKE |