lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-28 01:41:48 +03:00
Code Activity

cmake: Fixed find modules on Windows.

Browse Source
This commit is contained in:
Andreas Schneider
2010-12-30 00:26:37 +01:00
parent 08906e0f7f
commit 1646ce970c
5 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/Modules/FindCMockery.cmake
View File

@ -18,9 +18,6 @@ if (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS)
# in cache already # in cache already
set(CMOCKERY_FOUND TRUE) set(CMOCKERY_FOUND TRUE)
else (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS) else (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS)
if (WIN32)
set(_CMOCKERY_DIR $ENV{PROGRAMFILES}/cmockery)
endif (WIN32)
find_path(CMOCKERY_INCLUDE_DIR find_path(CMOCKERY_INCLUDE_DIR
NAMES NAMES
@ -31,6 +28,7 @@ else (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS)
/usr/local/include /usr/local/include
/opt/local/include /opt/local/include
/sw/include /sw/include
$ENV{PROGRAMFILES}/cmockery/include
) )
find_library(CMOCKERY_LIBRARY find_library(CMOCKERY_LIBRARY
@ -42,6 +40,7 @@ else (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS)
/usr/local/lib /usr/local/lib
/opt/local/lib /opt/local/lib
/sw/lib /sw/lib
$ENV{PROGRAMFILES}/cmockery/lib
) )
set(CMOCKERY_INCLUDE_DIRS set(CMOCKERY_INCLUDE_DIRS

4
cmake/Modules/FindGCrypt.cmake
View File

@ -23,23 +23,27 @@ else (GCRYPT_LIBRARIES AND GCRYPT_INCLUDE_DIRS)
NAMES NAMES
gcrypt.h gcrypt.h
PATHS PATHS
${_GCRYPT_DIR}/include
/usr/include /usr/include
/usr/local/include /usr/local/include
/opt/local/include /opt/local/include
/sw/include /sw/include
/usr/lib/sfw/include /usr/lib/sfw/include
$ENV{PROGRAMFILES}/GnuWin32/include
) )
find_library(GCRYPT_LIBRARY find_library(GCRYPT_LIBRARY
NAMES NAMES
gcrypt gcrypt
PATHS PATHS
${_GCRYPT_DIR}/lib
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/opt/local/lib /opt/local/lib
/sw/lib /sw/lib
/usr/sfw/lib/64 /usr/sfw/lib/64
/usr/sfw/lib /usr/sfw/lib
$ENV{PROGRAMFILES}/GnuWin32/lib
) )
set(GCRYPT_INCLUDE_DIRS set(GCRYPT_INCLUDE_DIRS

5
cmake/Modules/FindNSIS.cmake
View File

@ -11,10 +11,6 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# #
if (NSIS_MAKE)
# in cache already
set(NSIS_FOUND TRUE)
elseif (NSIS_MAKE)
find_program(NSIS_MAKE find_program(NSIS_MAKE
NAMES NAMES
makensis makensis
@ -28,4 +24,3 @@ elseif (NSIS_MAKE)
find_package_handle_standard_args(NSIS DEFAULT_MSG NSIS_MAKE) find_package_handle_standard_args(NSIS DEFAULT_MSG NSIS_MAKE)
mark_as_advanced(NSIS_MAKE) mark_as_advanced(NSIS_MAKE)
endif (NSIS_MAKE)

8
cmake/Modules/FindOpenSSL.cmake
View File

@ -13,14 +13,10 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# #
if (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) if (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS)
# in cache already # in cache already
set(OPENSSL_FOUND TRUE) set(OPENSSL_FOUND TRUE)
else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS) else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS)
if (WIN32)
set(_OPENSSL_DIR $ENV{PROGRAMFILES}/OpenSSL)
endif (WIN32)
find_package(PkgConfig) find_package(PkgConfig)
if (PKG_CONFIG_FOUND) if (PKG_CONFIG_FOUND)
@ -38,6 +34,8 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS)
/opt/local/include /opt/local/include
/sw/include /sw/include
/usr/lib/sfw/include /usr/lib/sfw/include
$ENV{PROGRAMFILES}/OpenSSL/include
$ENV{PROGRAMFILES}/OpenSSL-Win32/include
) )
find_library(SSL_LIBRARY find_library(SSL_LIBRARY
@ -53,6 +51,8 @@ else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS)
/sw/lib /sw/lib
/usr/sfw/lib/64 /usr/sfw/lib/64
/usr/sfw/lib /usr/sfw/lib
$ENV{PROGRAMFILES}/OpenSSL/lib
$ENV{PROGRAMFILES}/OpenSSL-Win32/lib
) )
find_library(SSLEAY32_LIBRARY find_library(SSLEAY32_LIBRARY

7
cmake/Modules/FindZLIB.cmake
View File

@ -18,9 +18,6 @@ if (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS)
# in cache already # in cache already
set(ZLIB_FOUND TRUE) set(ZLIB_FOUND TRUE)
else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS) else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS)
if (WIN32)
set(_ZLIB_DIR $ENV{PROGRAMFILES}/GnuWin32)
endif (WIN32)
find_path(ZLIB_INCLUDE_DIR find_path(ZLIB_INCLUDE_DIR
NAMES NAMES
@ -32,6 +29,8 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS)
/opt/local/include /opt/local/include
/sw/include /sw/include
/usr/lib/sfw/include /usr/lib/sfw/include
$ENV{PROGRAMFILES}/GnuWin32/include
$ENV{PROGRAMFILES}/zlib/include
) )
find_library(Z_LIBRARY find_library(Z_LIBRARY
@ -47,6 +46,8 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS)
/sw/lib /sw/lib
/usr/sfw/lib/64 /usr/sfw/lib/64
/usr/sfw/lib /usr/sfw/lib
$ENV{PROGRAMFILES}/GnuWin32/lib
$ENV{PROGRAMFILES}/zlib/lib
) )
set(ZLIB_INCLUDE_DIRS set(ZLIB_INCLUDE_DIRS