diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 17:47:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-13 18:19:16 (GMT) |
| commit | 77543bde41b0e52c3959016698b529835945d62d (patch) | |
| tree | ff63e5fbec326c4a5d821e7496c6d2cb52f75b92 /Modules/FindCURL.cmake | |
| parent | 7bbaa4283de26864b2e55e819db0884771585467 (diff) | |
| download | CMake-77543bde41b0e52c3959016698b529835945d62d.zip CMake-77543bde41b0e52c3959016698b529835945d62d.tar.gz CMake-77543bde41b0e52c3959016698b529835945d62d.tar.bz2 | |
Convert CMake-language commands to lower case
Ancient CMake versions required upper-case commands. Later command
names became case-insensitive. Now the preferred style is lower-case.
Run the following shell code:
cmake --help-command-list |
grep -v "cmake version" |
while read c; do
echo 's/\b'"$(echo $c | tr '[:lower:]' '[:upper:]')"'\(\s*\)(/'"$c"'\1(/g'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
Diffstat (limited to 'Modules/FindCURL.cmake')
| -rw-r--r-- | Modules/FindCURL.cmake | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/Modules/FindCURL.cmake b/Modules/FindCURL.cmake index 5f2181a..5c58b84 100644 --- a/Modules/FindCURL.cmake +++ b/Modules/FindCURL.cmake @@ -21,39 +21,39 @@ # License text for the above reference.) # Look for the header file. -FIND_PATH(CURL_INCLUDE_DIR NAMES curl/curl.h) -MARK_AS_ADVANCED(CURL_INCLUDE_DIR) +find_path(CURL_INCLUDE_DIR NAMES curl/curl.h) +mark_as_advanced(CURL_INCLUDE_DIR) # Look for the library. -FIND_LIBRARY(CURL_LIBRARY NAMES +find_library(CURL_LIBRARY NAMES curl # Windows MSVC prebuilts: curllib libcurl_imp curllib_static ) -MARK_AS_ADVANCED(CURL_LIBRARY) +mark_as_advanced(CURL_LIBRARY) -IF(CURL_INCLUDE_DIR) - FOREACH(_curl_version_header curlver.h curl.h) - IF(EXISTS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}") - FILE(STRINGS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}" curl_version_str REGEX "^#define[\t ]+LIBCURL_VERSION[\t ]+\".*\"") +if(CURL_INCLUDE_DIR) + foreach(_curl_version_header curlver.h curl.h) + if(EXISTS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}") + file(STRINGS "${CURL_INCLUDE_DIR}/curl/${_curl_version_header}" curl_version_str REGEX "^#define[\t ]+LIBCURL_VERSION[\t ]+\".*\"") - STRING(REGEX REPLACE "^#define[\t ]+LIBCURL_VERSION[\t ]+\"([^\"]*)\".*" "\\1" CURL_VERSION_STRING "${curl_version_str}") - UNSET(curl_version_str) - BREAK() - ENDIF() - ENDFOREACH(_curl_version_header) -ENDIF() + string(REGEX REPLACE "^#define[\t ]+LIBCURL_VERSION[\t ]+\"([^\"]*)\".*" "\\1" CURL_VERSION_STRING "${curl_version_str}") + unset(curl_version_str) + break() + endif() + endforeach(_curl_version_header) +endif() # handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE if # all listed variables are TRUE -INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) +include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) FIND_PACKAGE_HANDLE_STANDARD_ARGS(CURL REQUIRED_VARS CURL_LIBRARY CURL_INCLUDE_DIR VERSION_VAR CURL_VERSION_STRING) -IF(CURL_FOUND) - SET(CURL_LIBRARIES ${CURL_LIBRARY}) - SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR}) -ENDIF(CURL_FOUND) +if(CURL_FOUND) + set(CURL_LIBRARIES ${CURL_LIBRARY}) + set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR}) +endif(CURL_FOUND) |