diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2013-04-24 07:49:26 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2013-04-24 07:49:26 +0200 |
| commit | ad4461b260fd8943709f7e1f30db36baa4bfd342 (patch) | |
| tree | 510aebec53a611b4529f8c24c0ab10d1530c8ea5 /cmake | |
| parent | 2ce761ccc6d8c19ccaf2af894c35c6a396e407aa (diff) | |
| download | libgd-ad4461b260fd8943709f7e1f30db36baa4bfd342.tar.gz | |
improve/fix vpx detection
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindVPX.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cmake/modules/FindVPX.cmake b/cmake/modules/FindVPX.cmake index af22296..9344729 100644 --- a/cmake/modules/FindVPX.cmake +++ b/cmake/modules/FindVPX.cmake @@ -20,33 +20,33 @@ INCLUDE(FindZLIB) SET(VPX_FOUND "NO") SET(VPX_LIBRARY "") -FIND_PATH(VPX_VPX_INCLUDE_DIR vp8cx.h +FIND_PATH(VPX_INCLUDE_DIR vp8cx.h /usr/local/include/vpx /usr/include/vpx ) -SET(VPX_NAMES ${VPX_NAMES} vpxmt libvpx) +SET(VPX_NAMES ${VPX_NAMES} "vpxmt" "libvpx") FIND_LIBRARY(VPX_LIBRARY NAMES ${VPX_NAMES} - PATHS /usr/lib64 /usr/lib /usr/local/lib + PATHS "${PROJECT_SOURCE_DIR}/../deps/lib" /usr/lib64 /usr/lib /usr/local/lib ) -IF (VPX_LIBRARY AND VPX_VPX_INCLUDE_DIR) - SET(VPX_INCLUDE_DIR ${VPX_VPX_INCLUDE_DIR}) +IF (VPX_LIBRARY AND VPX_INCLUDE_DIR) + SET(VPX_INCLUDE_DIR ${VPX_INCLUDE_DIR}) SET(VPX_LIBRARIES ${VPX_LIBRARY}) SET(VPX_FOUND "YES") -ENDIF (VPX_LIBRARY AND VPX_VPX_INCLUDE_DIR) +ENDIF (VPX_LIBRARY AND VPX_INCLUDE_DIR) IF (VPX_FOUND) IF (NOT VPX_FIND_QUIETLY) - MESSAGE(STATUS "Found XPM: ${VPX_LIBRARY}") + MESSAGE(STATUS "Found VPX: ${VPX_LIBRARY}") ENDIF (NOT VPX_FIND_QUIETLY) ELSE (VPX_FOUND) IF (VPX_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find XPM library") + MESSAGE(FATAL_ERROR "Could not find VPX library") ENDIF (VPX_FIND_REQUIRED) ENDIF (VPX_FOUND) -MARK_AS_ADVANCED(VPX_VPX_INCLUDE_DIR VPX_LIBRARY ) +MARK_AS_ADVANCED(VPX_INCLUDE_DIR VPX_LIBRARY ) SET(VPX_LIBRARIES ${VPX_LIBRARY}) |