Revision: 7056
http://playerstage.svn.sourceforge.net/playerstage/?rev=7056&view=rev
Author: gbiggs
Date: 2008-10-01 07:41:02 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
Made the driver check macros respect PLAYER_EXTRA_INCLUDE_DIRS
Modified Paths:
--------------
code/player/trunk/cmake/internal/DriverUtils.cmake
Modified: code/player/trunk/cmake/internal/DriverUtils.cmake
===================================================================
--- code/player/trunk/cmake/internal/DriverUtils.cmake 2008-09-30 21:52:04 UTC
(rev 7055)
+++ code/player/trunk/cmake/internal/DriverUtils.cmake 2008-10-01 07:41:02 UTC
(rev 7056)
@@ -206,6 +206,9 @@
# _header: Name of the header file to look for.
INCLUDE (CheckIncludeFiles)
MACRO (PLAYERDRIVER_REQUIRE_HEADER _name _cumulativeVar _header)
+ IF (${PLAYER_EXTRA_INCLUDE_DIRS})
+ LIST (APPEND CMAKE_REQUIRED_HEADERS ${PLAYER_EXTRA_INCLUDE_DIRS})
+ ENDIF (${PLAYER_EXTRA_INCLUDE_DIRS})
# Check for extra headers
SET (headers)
IF (${ARGC} GREATER 3)
@@ -245,6 +248,9 @@
# _header: Name of the header file to look for.
INCLUDE (CheckIncludeFileCXX)
MACRO (PLAYERDRIVER_REQUIRE_HEADER_CPP _name _cumulativeVar _header)
+ IF (${PLAYER_EXTRA_INCLUDE_DIRS})
+ LIST (APPEND CMAKE_REQUIRED_HEADERS ${PLAYER_EXTRA_INCLUDE_DIRS})
+ ENDIF (${PLAYER_EXTRA_INCLUDE_DIRS})
STRING (TOUPPER ${_header} headerUpper)
STRING (REGEX REPLACE "[./\\]" "_" headerUpper "${headerUpper}")
SET (resultVar "HAVE_HDR_${headerUpper}")
@@ -274,7 +280,11 @@
# _function: Name of the function to look for.
INCLUDE (CheckFunctionExists)
MACRO (PLAYERDRIVER_REQUIRE_FUNCTION _name _cumulativeVar _function)
- set (foundFunction)
+ IF (${PLAYER_EXTRA_INCLUDE_DIRS})
+ LIST (APPEND CMAKE_REQUIRED_HEADERS ${PLAYER_EXTRA_INCLUDE_DIRS})
+ ENDIF (${PLAYER_EXTRA_INCLUDE_DIRS})
+
+ SET (foundFunction)
CHECK_FUNCTION_EXISTS (${_function} foundFunction)
# If not found, disable this driver
# Dereference cumulativeVar only once because IF will dereference the
variable name stored inside itself
@@ -304,7 +314,7 @@
# _path: Location where the library is expected to be.
INCLUDE (CheckLibraryExists)
MACRO (PLAYERDRIVER_REQUIRE_LIB _name _cumulativeVar _library _function _path)
- set (foundLibrary)
+ SET (foundLibrary)
CHECK_LIBRARY_EXISTS ("${_library}" "${_function}" "${_path}" foundLibrary)
# If not found, disable this driver
# Dereference cumulativeVar only once because IF will dereference the
variable name stored inside itself
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
