ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake text improvements

This commit is contained in:
Kfir Itzhak 2013-10-21 17:13:07 +03:00
parent a341778ca2
commit c2477eb661
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
CMakeLists.txt
View File

@ -97,9 +97,9 @@ if(ZLIB_FOUND)
include_directories(${ZLIB_INCLUDE_DIR}) include_directories(${ZLIB_INCLUDE_DIR})
set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR}) set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
check_include_file("zlib.h" HAVE_ZLIB_H) check_include_file("zlib.h" HAVE_ZLIB_H)
set(optlibsfound "${optlibsfound} ZLIB") set(optlibsfound "${optlibsfound} zlib")
else(ZLIB_FOUND) else(ZLIB_FOUND)
set(optlibsnotfound "${optlibsnotfound} ZLIB") set(optlibsnotfound "${optlibsnotfound} zlib")
endif(ZLIB_FOUND) endif(ZLIB_FOUND)
# jpeg # jpeg
@ -127,9 +127,9 @@ if(OPENSSL_FOUND)
include_directories(${OPENSSL_INCLUDE_DIR}) include_directories(${OPENSSL_INCLUDE_DIR})
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H) check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
set(optlibsfound "${optlibsfound} OPENSSL") set(optlibsfound "${optlibsfound} OpenSSL")
else(OPENSSL_FOUND) else(OPENSSL_FOUND)
set(optlibsnotfound "${optlibsnotfound} OPENSSL") set(optlibsnotfound "${optlibsnotfound} OpenSSL")
endif(OPENSSL_FOUND) endif(OPENSSL_FOUND)
# pthread (using find_library and find_path) # pthread (using find_library and find_path)
@ -180,9 +180,9 @@ if(GCRYPT_LIBRARIES)
endif(GCRYPT_INCLUDE_DIR) endif(GCRYPT_INCLUDE_DIR)
mark_as_advanced(FORCE GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR) mark_as_advanced(FORCE GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR)
check_include_file("gcrypt.h" HAVE_GCRYPT_H) check_include_file("gcrypt.h" HAVE_GCRYPT_H)
set(optlibsfound "${optlibsfound} GCRYPT") set(optlibsfound "${optlibsfound} GCrypt")
else(GCRYPT_LIBRARIES) else(GCRYPT_LIBRARIES)
set(optlibsnotfound "${optlibsnotfound} GCRYPT") set(optlibsnotfound "${optlibsnotfound} GCrypt")
endif(GCRYPT_LIBRARIES) endif(GCRYPT_LIBRARIES)
# gnutls (using find_library and find_path) # gnutls (using find_library and find_path)
@ -198,9 +198,9 @@ if(GNUTLS_LIBRARIES)
mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR) mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
check_include_file("gnutls/openssl.h" HAVE_GNUTLS_OPENSSL_H) check_include_file("gnutls/openssl.h" HAVE_GNUTLS_OPENSSL_H)
check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H) check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
set(optlibsfound "${optlibsfound} GNUTLS") set(optlibsfound "${optlibsfound} GnuTLS")
else(GNUTLS_LIBRARIES) else(GNUTLS_LIBRARIES)
set(optlibsnotfound "${optlibsnotfound} GNUTLS") set(optlibsnotfound "${optlibsnotfound} GnuTLS")
endif(GNUTLS_LIBRARIES) endif(GNUTLS_LIBRARIES)
# mysqlclient (using find_library and find_path) # mysqlclient (using find_library and find_path)
@ -236,9 +236,9 @@ if(NOT ZM_NO_FFMPEG)
endif(AVFORMAT_INCLUDE_DIR) endif(AVFORMAT_INCLUDE_DIR)
mark_as_advanced(FORCE AVFORMAT_LIBRARIES AVFORMAT_INCLUDE_DIR) mark_as_advanced(FORCE AVFORMAT_LIBRARIES AVFORMAT_INCLUDE_DIR)
check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H) check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
set(optlibsfound "${optlibsfound} AVFORMAT") set(optlibsfound "${optlibsfound} AVFormat")
else(AVFORMAT_LIBRARIES) else(AVFORMAT_LIBRARIES)
set(optlibsnotfound "${optlibsnotfound} AVFORMAT") set(optlibsnotfound "${optlibsnotfound} AVFormat")
endif(AVFORMAT_LIBRARIES) endif(AVFORMAT_LIBRARIES)
# avcodec (using find_library and find_path) # avcodec (using find_library and find_path)
@ -253,9 +253,9 @@ if(NOT ZM_NO_FFMPEG)
endif(AVCODEC_INCLUDE_DIR) endif(AVCODEC_INCLUDE_DIR)
mark_as_advanced(FORCE AVCODEC_LIBRARIES AVCODEC_INCLUDE_DIR) mark_as_advanced(FORCE AVCODEC_LIBRARIES AVCODEC_INCLUDE_DIR)
check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H) check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
set(optlibsfound "${optlibsfound} AVCODEC") set(optlibsfound "${optlibsfound} AVCodec")
else(AVCODEC_LIBRARIES) else(AVCODEC_LIBRARIES)
set(optlibsnotfound "${optlibsnotfound} AVCODEC") set(optlibsnotfound "${optlibsnotfound} AVCodec")
endif(AVCODEC_LIBRARIES) endif(AVCODEC_LIBRARIES)
# avdevice (using find_library and find_path) # avdevice (using find_library and find_path)
@ -270,9 +270,9 @@ if(NOT ZM_NO_FFMPEG)
endif(AVDEVICE_INCLUDE_DIR) endif(AVDEVICE_INCLUDE_DIR)
mark_as_advanced(FORCE AVDEVICE_LIBRARIES AVDEVICE_INCLUDE_DIR) mark_as_advanced(FORCE AVDEVICE_LIBRARIES AVDEVICE_INCLUDE_DIR)
check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H) check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
set(optlibsfound "${optlibsfound} AVDEVICE") set(optlibsfound "${optlibsfound} AVDevice")
else(AVDEVICE_LIBRARIES) else(AVDEVICE_LIBRARIES)
set(optlibsnotfound "${optlibsnotfound} AVDEVICE") set(optlibsnotfound "${optlibsnotfound} AVDevice")
endif(AVDEVICE_LIBRARIES) endif(AVDEVICE_LIBRARIES)
# avutil (using find_library and find_path) # avutil (using find_library and find_path)
@ -288,9 +288,9 @@ if(NOT ZM_NO_FFMPEG)
mark_as_advanced(FORCE AVUTIL_LIBRARIES AVUTIL_INCLUDE_DIR) mark_as_advanced(FORCE AVUTIL_LIBRARIES AVUTIL_INCLUDE_DIR)
check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H) check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H) check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
set(optlibsfound "${optlibsfound} AVUTIL") set(optlibsfound "${optlibsfound} AVUtil")
else(AVUTIL_LIBRARIES) else(AVUTIL_LIBRARIES)
set(optlibsnotfound "${optlibsnotfound} AVUTIL") set(optlibsnotfound "${optlibsnotfound} AVUtil")
endif(AVUTIL_LIBRARIES) endif(AVUTIL_LIBRARIES)
# swscale (using find_library and find_path) # swscale (using find_library and find_path)
@ -305,9 +305,9 @@ if(NOT ZM_NO_FFMPEG)
endif(SWSCALE_INCLUDE_DIR) endif(SWSCALE_INCLUDE_DIR)
mark_as_advanced(FORCE SWSCALE_LIBRARIES SWSCALE_INCLUDE_DIR) mark_as_advanced(FORCE SWSCALE_LIBRARIES SWSCALE_INCLUDE_DIR)
check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H) check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
set(optlibsfound "${optlibsfound} SWSCALE") set(optlibsfound "${optlibsfound} SWScale")
else(SWSCALE_LIBRARIES) else(SWSCALE_LIBRARIES)
set(optlibsnotfound "${optlibsnotfound} SWSCALE") set(optlibsnotfound "${optlibsnotfound} SWScale")
endif(SWSCALE_LIBRARIES) endif(SWSCALE_LIBRARIES)
endif(NOT ZM_NO_FFMPEG) endif(NOT ZM_NO_FFMPEG)

2
INSTALL
View File

@ -71,7 +71,7 @@ To replace the CFLAGS and CXXFLAGS entirely:
* For the Debug build type: use CMAKE_C_FLAGS_DEBUG for the CFLAGS and CMAKE_CXX_FLAGS_DEBUG for the CXXFLAGS * For the Debug build type: use CMAKE_C_FLAGS_DEBUG for the CFLAGS and CMAKE_CXX_FLAGS_DEBUG for the CXXFLAGS
Other important environment variables (such as LDFLAGS) are also supported. Other important environment variables (such as LDFLAGS) are also supported.
The DESTDIR environment variable is also supported, however it needs to be set by invoking cmake. For example: DESTDIR=mydestdir cmake [extra options] . The DESTDIR environment variable is also supported, however it needs to be set before invoking cmake. For example: DESTDIR=mydestdir cmake [extra options] .
For more information about DESTDIR, see: For more information about DESTDIR, see:
* http://www.gnu.org/prep/standards/html_node/DESTDIR.html * http://www.gnu.org/prep/standards/html_node/DESTDIR.html