shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 10:40:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation and installation of libssh.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@250 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-03-08 14:05:41 +00:00
parent 461d9413d3
commit b4cebfb03d
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -59,8 +59,10 @@ add_subdirectory(libssh)
# build samples # build samples
include_directories(${CMAKE_SOURCE_DIR}/include) include_directories(${CMAKE_SOURCE_DIR}/include)
if (UNIX AND NOT WIN32)
add_executable(samplessh sample.c) add_executable(samplessh sample.c)
add_executable(samplesshd samplesshd.c) add_executable(samplesshd samplesshd.c)
target_link_libraries(samplessh ${LIBSSH_LIBRARY}) target_link_libraries(samplessh ${LIBSSH_LIBRARY})
target_link_libraries(samplesshd ${LIBSSH_LIBRARY}) target_link_libraries(samplesshd ${LIBSSH_LIBRARY})
endif (UNIX AND NOT WIN32)

15
cmake/Modules/DefineInstallationPaths.cmake
View File

@@ -112,13 +112,14 @@ endif (UNIX)
if (WIN32) if (WIN32)
# Same same # Same same
SET(BIN_INSTALL_DIR .) SET(BIN_INSTALL_DIR bin)
SET(SBIN_INSTALL_DIR .) SET(SBIN_INSTALL_DIR bin)
SET(LIB_INSTALL_DIR .) SET(LIB_INSTALL_DIR lib)
SET(PLUGIN_INSTALL_DIR plugins) SET(INCLUDE_INSTALL_DIR include)
SET(PLUGIN_INSTALL_DIR bin)
SET(HTML_INSTALL_DIR doc/HTML) SET(HTML_INSTALL_DIR doc/HTML)
SET(ICON_INSTALL_DIR .) SET(ICON_INSTALL_DIR bin)
SET(SOUND_INSTALL_DIR .) SET(SOUND_INSTALL_DIR bin)
SET(LOCALE_INSTALL_DIR lang) SET(LOCALE_INSTALL_DIR bin)
endif (WIN32) endif (WIN32)

7
libssh/CMakeLists.txt
View File

@@ -22,6 +22,13 @@ set(LIBSSH_LINK_LIBRARIES
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
) )
if (WIN32)
set(LIBSSH_LINK_LIBRARIES
${LIBSSH_LINK_LIBRARIES}
ws2_32
)
endif (WIN32)
if (CRYPTO_LIBRARY) if (CRYPTO_LIBRARY)
set(LIBSSH_PRIVATE_INCLUDE_DIRS set(LIBSSH_PRIVATE_INCLUDE_DIRS
${LIBSSH_PRIVATE_INCLUDE_DIRS} ${LIBSSH_PRIVATE_INCLUDE_DIRS}