|
From: Stefano A. <xa...@us...> - 2009-12-01 23:04:20
|
Module: performous
Branch: master
Commit: 3714d473e1b11f1b30ae23dd6450b8e0c562a352
Author: Xaldyz <xa...@us...>
Date: Wed Dec 2 00:04:02 2009 +0100
Fixed library detection (under Windows) if DLLs are in PATH
---
cmake/Modules/FindAVCodec.cmake | 2 +-
cmake/Modules/FindAVFormat.cmake | 2 +-
cmake/Modules/FindAVUtil.cmake | 2 +-
cmake/Modules/FindSWScale.cmake | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake/Modules/FindAVCodec.cmake b/cmake/Modules/FindAVCodec.cmake
index cdd8f69..400ac58 100644
--- a/cmake/Modules/FindAVCodec.cmake
+++ b/cmake/Modules/FindAVCodec.cmake
@@ -38,7 +38,7 @@ if(AVCodec_INCLUDE_DIR)
endif(AVCodec_INCLUDE_DIR)
find_library(AVCodec_LIBRARY
- NAMES avcodec
+ NAMES libavcodec.dll.a avcodec
PATHS ${AVCodec_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindAVFormat.cmake b/cmake/Modules/FindAVFormat.cmake
index 7c04c60..b02d2a6 100644
--- a/cmake/Modules/FindAVFormat.cmake
+++ b/cmake/Modules/FindAVFormat.cmake
@@ -36,7 +36,7 @@ if(AVFormat_INCLUDE_DIR)
endif(AVFormat_INCLUDE_DIR)
find_library(AVFormat_LIBRARY
- NAMES avformat
+ NAMES libavformat.dll.a avformat
PATHS ${AVFormat_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindAVUtil.cmake b/cmake/Modules/FindAVUtil.cmake
index 8d4fb4e..99bfbfb 100644
--- a/cmake/Modules/FindAVUtil.cmake
+++ b/cmake/Modules/FindAVUtil.cmake
@@ -34,7 +34,7 @@ if(AVUtil_INCLUDE_DIR)
endif(AVUtil_INCLUDE_DIR)
find_library(AVUtil_LIBRARY
- NAMES avutil
+ NAMES libavutil.dll.a avutil
PATHS ${AVUtil_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindSWScale.cmake b/cmake/Modules/FindSWScale.cmake
index ecd8da0..e675a51 100644
--- a/cmake/Modules/FindSWScale.cmake
+++ b/cmake/Modules/FindSWScale.cmake
@@ -36,7 +36,7 @@ if(SWScale_INCLUDE_DIR)
endif(SWScale_INCLUDE_DIR)
find_library(SWScale_LIBRARY
- NAMES swscale
+ NAMES libswscale.dll.a swscale
PATHS ${SWScale_PKGCONF_LIBRARY_DIRS}
)
|