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/FindJPEG.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/FindJPEG.cmake')
| -rw-r--r-- | Modules/FindJPEG.cmake | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Modules/FindJPEG.cmake b/Modules/FindJPEG.cmake index 349e7e1..7c1f0fd 100644 --- a/Modules/FindJPEG.cmake +++ b/Modules/FindJPEG.cmake @@ -20,24 +20,24 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -FIND_PATH(JPEG_INCLUDE_DIR jpeglib.h) +find_path(JPEG_INCLUDE_DIR jpeglib.h) -SET(JPEG_NAMES ${JPEG_NAMES} jpeg) -FIND_LIBRARY(JPEG_LIBRARY NAMES ${JPEG_NAMES} ) +set(JPEG_NAMES ${JPEG_NAMES} jpeg) +find_library(JPEG_LIBRARY NAMES ${JPEG_NAMES} ) -# handle the QUIETLY and REQUIRED arguments and set JPEG_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set JPEG_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(JPEG DEFAULT_MSG JPEG_LIBRARY JPEG_INCLUDE_DIR) -IF(JPEG_FOUND) - SET(JPEG_LIBRARIES ${JPEG_LIBRARY}) -ENDIF(JPEG_FOUND) +if(JPEG_FOUND) + set(JPEG_LIBRARIES ${JPEG_LIBRARY}) +endif() # Deprecated declarations. -SET (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} ) -IF(JPEG_LIBRARY) - GET_FILENAME_COMPONENT (NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH) -ENDIF(JPEG_LIBRARY) +set (NATIVE_JPEG_INCLUDE_PATH ${JPEG_INCLUDE_DIR} ) +if(JPEG_LIBRARY) + get_filename_component (NATIVE_JPEG_LIB_PATH ${JPEG_LIBRARY} PATH) +endif() -MARK_AS_ADVANCED(JPEG_LIBRARY JPEG_INCLUDE_DIR ) +mark_as_advanced(JPEG_LIBRARY JPEG_INCLUDE_DIR ) |