aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authormontellese <montellese@xbmc.org>2015-02-13 22:40:25 +0100
committermontellese <montellese@xbmc.org>2015-03-01 21:02:31 +0100
commit996b6a37f7381d6928eea7bd7332a05042b38ec2 (patch)
treec846289b4ae4abbe13dda4bf9e085ef524dc800c /tools
parentf4d3a84797c70bc227a97ccc31c8edaf86f7cf9b (diff)
[depends] add RBPI's firmware directory to CMAKE_FIND_ROOT_PATH and CMAKE_LIBRARY_PATH
Diffstat (limited to 'tools')
-rw-r--r--tools/depends/configure.in1
-rw-r--r--tools/depends/target/Toolchain.cmake.in6
2 files changed, 7 insertions, 0 deletions
diff --git a/tools/depends/configure.in b/tools/depends/configure.in
index fb9f7760cb..8e4607300d 100644
--- a/tools/depends/configure.in
+++ b/tools/depends/configure.in
@@ -498,6 +498,7 @@ AC_SUBST(use_toolchain)
AC_SUBST(use_build_toolchain)
AC_SUBST(use_tarballs)
AC_SUBST(use_platform)
+AC_SUBST(use_firmware)
AC_SUBST(cross_compiling)
AC_SUBST(platform_cflags)
AC_SUBST(platform_cxxflags)
diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in
index 857c21bf80..943be731d3 100644
--- a/tools/depends/target/Toolchain.cmake.in
+++ b/tools/depends/target/Toolchain.cmake.in
@@ -29,6 +29,12 @@ SET(CMAKE_LINKER @LD@ CACHE FILEPATH "Linker")
SET(CMAKE_FIND_ROOT_PATH @prefix@/@deps_dir@ @use_toolchain@ @use_toolchain@/usr @use_sdk_path@ @use_sdk_path@/usr @use_toolchain@/sysroot/usr)
SET(CMAKE_LIBRARY_PATH @prefix@/@deps_dir@/lib:@use_toolchain@/usr/lib/@use_host@:@use_toolchain@/lib/@use_host@)
+# add RBPI's firmware directories
+IF("${CORE_SYSTEM_NAME}" STREQUAL "rbpi")
+ LIST(APPEND CMAKE_FIND_ROOT_PATH @use_firmware@/opt/vc)
+ LIST(APPEND CMAKE_LIBRARY_PATH @use_firmware@/opt/vc/lib)
+ENDIF()
+
SET(CMAKE_C_FLAGS "@platform_cflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include")
SET(CMAKE_CXX_FLAGS "@platform_cxxflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include")
SET(CMAKE_CPP_FLAGS "@platform_cflags@ @platform_includes@ -isystem @prefix@/@deps_dir@/include")