diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-14 12:31:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-14 12:31:45 (GMT) |
| commit | cd3bd23266a4a6c00595134a17a8bdaea9e28af5 (patch) | |
| tree | 515fcf4fdee211067497339acb52de321640c4fc /Modules/FindEXPAT.cmake | |
| parent | 9acb4f118cd9a52aaa66897b1c0cd11dace3851c (diff) | |
| parent | 68bc863d5bd64f3e893722e403d4fd56bd2e175a (diff) | |
| download | CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.zip CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.gz CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.bz2 | |
Merge topic 'cleanup-style'
68bc863 Merge branch 'master' into cleanup-style
a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483 Remove trailing TAB from NSIS.template.in
9db3116 Remove CMake-language block-end command arguments
77543bd Convert CMake-language commands to lower case
7bbaa42 Remove trailing whitespace from most CMake and C/C++ code
be9db98 Merge topic 'watcom-compiler-version'
af42ae4 Watcom: Simplify compiler version detection (#11866)
Diffstat (limited to 'Modules/FindEXPAT.cmake')
| -rw-r--r-- | Modules/FindEXPAT.cmake | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Modules/FindEXPAT.cmake b/Modules/FindEXPAT.cmake index 1bf0743..c681a0d 100644 --- a/Modules/FindEXPAT.cmake +++ b/Modules/FindEXPAT.cmake @@ -19,10 +19,10 @@ # License text for the above reference.) # Look for the header file. -FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h) +find_path(EXPAT_INCLUDE_DIR NAMES expat.h) # Look for the library. -FIND_LIBRARY(EXPAT_LIBRARY NAMES expat libexpat) +find_library(EXPAT_LIBRARY NAMES expat libexpat) if (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h") file(STRINGS "${EXPAT_INCLUDE_DIR}/expat.h" expat_version_str @@ -36,25 +36,25 @@ if (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h") EXPAT_VERSION_PART "${VLINE}") if(EXPAT_VERSION_STRING) set(EXPAT_VERSION_STRING "${EXPAT_VERSION_STRING}.${EXPAT_VERSION_PART}") - else(EXPAT_VERSION_STRING) + else() set(EXPAT_VERSION_STRING "${EXPAT_VERSION_PART}") - endif(EXPAT_VERSION_STRING) + endif() endif() - endforeach(VLINE) - endforeach(VPART) -endif (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h") + endforeach() + endforeach() +endif () -# handle the QUIETLY and REQUIRED arguments and set EXPAT_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set EXPAT_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(EXPAT REQUIRED_VARS EXPAT_LIBRARY EXPAT_INCLUDE_DIR VERSION_VAR EXPAT_VERSION_STRING) # Copy the results to the output variables. -IF(EXPAT_FOUND) - SET(EXPAT_LIBRARIES ${EXPAT_LIBRARY}) - SET(EXPAT_INCLUDE_DIRS ${EXPAT_INCLUDE_DIR}) -ENDIF(EXPAT_FOUND) +if(EXPAT_FOUND) + set(EXPAT_LIBRARIES ${EXPAT_LIBRARY}) + set(EXPAT_INCLUDE_DIRS ${EXPAT_INCLUDE_DIR}) +endif() -MARK_AS_ADVANCED(EXPAT_INCLUDE_DIR EXPAT_LIBRARY) +mark_as_advanced(EXPAT_INCLUDE_DIR EXPAT_LIBRARY) |