piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added a FASTLOG option for the cmake build to enable all logs.

Browse Source 
Also make sure all necessary include directories are added in the check_lib macro.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6571 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-12-13 05:29:13 +00:00
parent dde2d1a117
commit 3d3411f3a0
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeTests/CheckLib.cmake
View File

@ -1,7 +1,7 @@
include(FindPkgConfig OPTIONAL)
macro(_internal_message msg _quiet)
if(NOT _quiet)
macro(_internal_message msg)
if(NOT ${_is_quiet})
message("${msg}")
endif()
endmacro()
@ -9,18 +9,17 @@ endmacro()
macro(check_lib var lib)
set(_is_required 0)
set(_is_quiet 0)
set(_arg_list ${ARGN})
foreach(_arg ${ARGN})
if(_arg STREQUAL "REQUIRED")
list(REMOVE_ITEM _arg_list "REQUIRED")
set(_is_required 1)
endif()
if(_arg STREQUAL "QUIET")
list(REMOVE_ITEM _arg_list "QUIET")
set(_is_quiet 1)
endif()
endforeach()
if(ARGN)
list(REMOVE_ITEM ${ARGN} "REQUIRED")
list(REMOVE_ITEM ${ARGN} "QUIET")
endif()
if(PKG_CONFIG_FOUND AND NOT ${var}_FOUND)
string(TOLOWER ${lib} lower_lib)
@ -28,20 +27,23 @@ macro(check_lib var lib)
endif()
if(${var}_FOUND)
_internal_message("${lib} found" _is_quiet)
include_directories(${${var}_INCLUDE_DIRS})
# Make sure include directories for headers found using find_path below
# are re-added when reconfiguring
include_directories(${${var}_INCLUDE})
_internal_message("${lib} found")
else()
find_library(${var} ${lib})
foreach(_file ${ARGN})
find_path(${var}_INCLUDE ${_file})
endforeach()
find_path(${var}_INCLUDE ${_arg_list})
if(${var} AND ${var}_INCLUDE)
_internal_message("${lib} found" _is_quiet)
include_directories(${${var}_INCLUDE})
_internal_message("${lib} found")
set(${var}_FOUND 1 CACHE INTERNAL "")
else()
if(_is_required)
message(FATAL_ERROR "${lib} is required but not found")
else()
_internal_message("${lib} not found" _is_quiet)
_internal_message("${lib} not found")
endif()
endif()
endif()