diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-08-12 00:04:30 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-08-12 00:04:30 +0200 |
| commit | 86418bfbbe2d6afcd630f93d5858f2d3353e12f9 (patch) | |
| tree | f7e06b71df755e454cf8b5a8a20795288733867c /cmake/Modules | |
| parent | 1e1c13f756287e14ff37b6410ef29c67494c830b (diff) | |
| parent | db284d60b97bbee864d88737b4f8c6ae5b03c8ff (diff) | |
| download | libssh-86418bfbbe2d6afcd630f93d5858f2d3353e12f9.tar.gz libssh-86418bfbbe2d6afcd630f93d5858f2d3353e12f9.tar.xz libssh-86418bfbbe2d6afcd630f93d5858f2d3353e12f9.zip | |
Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/DefineCompilerFlags.cmake | 5 | ||||
| -rw-r--r-- | cmake/Modules/DefineInstallationPaths.cmake | 2 | ||||
| -rw-r--r-- | cmake/Modules/FindOpenSSL.cmake | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake index 90bfbaf3..97ece25d 100644 --- a/cmake/Modules/DefineCompilerFlags.cmake +++ b/cmake/Modules/DefineCompilerFlags.cmake @@ -48,3 +48,8 @@ if (UNIX AND NOT WIN32) endif (WITH_FORTIFY_SOURCE) endif (CMAKE_COMPILER_IS_GNUCC) endif (UNIX AND NOT WIN32) + +# suppress warning about "deprecated" functions +if(MSVC) +add_definitions(-D_CRT_SECURE_NO_WARNINGS) +endif(MSVC) diff --git a/cmake/Modules/DefineInstallationPaths.cmake b/cmake/Modules/DefineInstallationPaths.cmake index e45977d7..71e1e854 100644 --- a/cmake/Modules/DefineInstallationPaths.cmake +++ b/cmake/Modules/DefineInstallationPaths.cmake @@ -94,7 +94,7 @@ endif (UNIX) if (WIN32) # Same same - set(BIN_INSTALL_DIR "." CACHE PATH "-") + set(BIN_INSTALL_DIR "bin" CACHE PATH "-") set(SBIN_INSTALL_DIR "." CACHE PATH "-") set(LIB_INSTALL_DIR "lib" CACHE PATH "-") set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-") diff --git a/cmake/Modules/FindOpenSSL.cmake b/cmake/Modules/FindOpenSSL.cmake index 2e7dffbb..c74ea48d 100644 --- a/cmake/Modules/FindOpenSSL.cmake +++ b/cmake/Modules/FindOpenSSL.cmake @@ -87,6 +87,10 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) NAMES crypto libcrypto + eay + eay32 + libeay + libeay32 PATHS ${_OPENSSL_LIBDIR} /usr/lib |