games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-15 13:33:36 +02:00
Code Issues Releases Activity

FFMpeg: also find libs in x64/x86 subfolders

Browse Source
This commit is contained in:
Mikhail Paulyshka 2014-10-12 16:32:50 +03:00
parent ab5e1f9109
commit f5f254f9ba
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake_modules/FindFFmpeg.cmake
View File

@ -35,6 +35,14 @@ if (NOT FFmpeg_FIND_COMPONENTS)
set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE) set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE)
endif () endif ()
if(MSVC)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(VC_LIB_PATH_SUFFIX lib/x64)
else()
set(VC_LIB_PATH_SUFFIX lib/x86)
endif()
endif()
# #
### Macro: set_component_found ### Macro: set_component_found
# #
@ -76,8 +84,10 @@ macro(find_component _component _pkgconfig _library _header)
find_library(${_component}_LIBRARIES NAMES ${_library} find_library(${_component}_LIBRARIES NAMES ${_library}
HINTS HINTS
${PC_LIB${_component}_LIBDIR} ${PC_LIB${_component}_LIBDIR}
${PC_LIB${_component}_LIBRARY_DIRS} ${PC_LIB${_component}_LIBRARY_DIRS}
PATH_SUFFIXES
${VC_LIB_PATH_SUFFIX}
) )
set(${_component}_DEFINITIONS ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.") set(${_component}_DEFINITIONS ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")