From d7ec60fb713d861a540a0ce40df027564d3a47db Mon Sep 17 00:00:00 2001 From: Sergei Nikulov Date: Fri, 9 Jan 2015 22:31:38 +0300 Subject: [PATCH] updated per initial patch review --- CMakeLists.txt | 18 +++++++++--------- src/CMakeLists.txt | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cd264d..4d3db31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -295,15 +295,15 @@ if(CMAKE_USE_OPENSSL) set(HAVE_LIBSSL ON) include_directories(${OPENSSL_INCLUDE_DIR}) set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) - check_include_file_concat("openssl/crypto.h" HAVE_OPENSSL_CRYPTO_H) - check_include_file_concat("openssl/engine.h" HAVE_OPENSSL_ENGINE_H) - check_include_file_concat("openssl/err.h" HAVE_OPENSSL_ERR_H) - check_include_file_concat("openssl/pem.h" HAVE_OPENSSL_PEM_H) - check_include_file_concat("openssl/pkcs12.h" HAVE_OPENSSL_PKCS12_H) - check_include_file_concat("openssl/rsa.h" HAVE_OPENSSL_RSA_H) - check_include_file_concat("openssl/ssl.h" HAVE_OPENSSL_SSL_H) - check_include_file_concat("openssl/x509.h" HAVE_OPENSSL_X509_H) - check_include_file_concat("openssl/rand.h" HAVE_OPENSSL_RAND_H) + check_include_file("openssl/crypto.h" HAVE_OPENSSL_CRYPTO_H) + check_include_file("openssl/engine.h" HAVE_OPENSSL_ENGINE_H) + check_include_file("openssl/err.h" HAVE_OPENSSL_ERR_H) + check_include_file("openssl/pem.h" HAVE_OPENSSL_PEM_H) + check_include_file("openssl/pkcs12.h" HAVE_OPENSSL_PKCS12_H) + check_include_file("openssl/rsa.h" HAVE_OPENSSL_RSA_H) + check_include_file("openssl/ssl.h" HAVE_OPENSSL_SSL_H) + check_include_file("openssl/x509.h" HAVE_OPENSSL_X509_H) + check_include_file("openssl/rand.h" HAVE_OPENSSL_RAND_H) endif() endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 74194ed..bfb866b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,18 +6,18 @@ if(USE_MANUAL) # embedded text. NROFF and MANOPT are set in the parent CMakeLists.txt add_custom_command( OUTPUT tool_hugehelp.c - COMMAND echo "#include \"tool_setup.h\"" > tool_hugehelp.c - COMMAND echo "#ifndef HAVE_LIBZ" >> tool_hugehelp.c + COMMAND ${CMAKE_COMMAND} -E echo "#include \"tool_setup.h\"" > tool_hugehelp.c + COMMAND ${CMAKE_COMMAND} -E echo "#ifndef HAVE_LIBZ" >> tool_hugehelp.c COMMAND env LC_ALL=C "${NROFF}" ${NROFF_MANOPT} "${CURL_SOURCE_DIR}/docs/curl.1" | "${PERL}" "${CMAKE_CURRENT_SOURCE_DIR}/mkhelp.pl" "${CURL_SOURCE_DIR}/docs/MANUAL" >> tool_hugehelp.c - COMMAND echo "#else" >> tool_hugehelp.c + COMMAND ${CMAKE_COMMAND} -E echo "#else" >> tool_hugehelp.c COMMAND env LC_ALL=C "${NROFF}" ${NROFF_MANOPT} "${CURL_SOURCE_DIR}/docs/curl.1" | "${PERL}" "${CMAKE_CURRENT_SOURCE_DIR}/mkhelp.pl" -c "${CURL_SOURCE_DIR}/docs/MANUAL" >> tool_hugehelp.c - COMMAND echo "#endif /* HAVE_LIBZ */" >> tool_hugehelp.c + COMMAND ${CMAKE_COMMAND} -E echo "#endif /* HAVE_LIBZ */" >> tool_hugehelp.c DEPENDS "${CURL_SOURCE_DIR}/docs/MANUAL" "${CURL_SOURCE_DIR}/docs/curl.1" @@ -27,9 +27,9 @@ if(USE_MANUAL) else() add_custom_command( OUTPUT tool_hugehelp.c - COMMAND ${CMAKE_COMMAND} -E echo "/* built-in manual is disabled, blank function */" > "tool_hugehelp.c" - COMMAND ${CMAKE_COMMAND} -E echo "\#include \"tool_hugehelp.h\"" >> "tool_hugehelp.c" - COMMAND ${CMAKE_COMMAND} -E echo "void hugehelp(void) {}" >> "tool_hugehelp.c" + COMMAND ${CMAKE_COMMAND} -E echo "/* built-in manual is disabled, blank function */" > tool_hugehelp.c + COMMAND ${CMAKE_COMMAND} -E echo "#include \"tool_hugehelp.h\"" >> tool_hugehelp.c + COMMAND ${CMAKE_COMMAND} -E echo "void hugehelp(void) {}" >> tool_hugehelp.c DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/tool_hugehelp.h" VERBATIM) -- 1.9.5.msysgit.0