From 8cdf8dec703d882b46ca50a769fabb95ffc48e2c Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Thu, 24 Nov 2016 21:27:41 +0100
Subject: sync with upstream

---
 project/cmake/scripts/rbpi/ArchSetup.cmake | 28 ++++++++++++++++++++++++++
 project/cmake/scripts/rbpi/Install.cmake   |  1 +
 project/cmake/scripts/rbpi/Macros.cmake    |  1 +
 project/cmake/scripts/rbpi/PathSetup.cmake |  1 +
 project/cmake/scripts/rbpi/archsetup.cmake | 32 ------------------------------
 project/cmake/scripts/rbpi/install.cmake   |  1 -
 project/cmake/scripts/rbpi/macros.cmake    |  1 -
 project/cmake/scripts/rbpi/pathsetup.cmake |  1 -
 8 files changed, 31 insertions(+), 35 deletions(-)
 create mode 100644 project/cmake/scripts/rbpi/ArchSetup.cmake
 create mode 120000 project/cmake/scripts/rbpi/Install.cmake
 create mode 120000 project/cmake/scripts/rbpi/Macros.cmake
 create mode 120000 project/cmake/scripts/rbpi/PathSetup.cmake
 delete mode 100644 project/cmake/scripts/rbpi/archsetup.cmake
 delete mode 120000 project/cmake/scripts/rbpi/install.cmake
 delete mode 120000 project/cmake/scripts/rbpi/macros.cmake
 delete mode 120000 project/cmake/scripts/rbpi/pathsetup.cmake

(limited to 'project/cmake/scripts/rbpi')

diff --git a/project/cmake/scripts/rbpi/ArchSetup.cmake b/project/cmake/scripts/rbpi/ArchSetup.cmake
new file mode 100644
index 0000000..fa1f9f4
--- /dev/null
+++ b/project/cmake/scripts/rbpi/ArchSetup.cmake
@@ -0,0 +1,28 @@
+set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI
+                 -DHAS_OMXPLAYER -DHAVE_OMXLIB)
+set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_FILE_DEFINED
+                   -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64)
+set(PLATFORM_DIR linux)
+
+string(REGEX REPLACE "[ ]+" ";" SYSTEM_LDFLAGS $ENV{LDFLAGS})
+set(CMAKE_SYSTEM_NAME Linux)
+
+if(WITH_ARCH)
+  set(ARCH ${WITH_ARCH})
+else()
+  if(CPU STREQUAL arm1176jzf-s)
+    set(ARCH arm-linux-gnueabihf)
+    set(NEON False)
+  elseif(CPU MATCHES "cortex-a7" OR CPU MATCHES "cortex-a53")
+    set(ARCH arm-linux-gnueabihf)
+    set(NEON True)
+  else()
+    message(SEND_ERROR "Unknown CPU: ${CPU}")
+  endif()
+endif()
+
+find_package(CXX11 REQUIRED)
+
+set(MMAL_FOUND 1 CACHE INTERNAL "MMAL")
+set(OMX_FOUND 1 CACHE INTERNAL "OMX")
+set(OMXLIB_FOUND 1 CACHE INTERNAL "OMX")
diff --git a/project/cmake/scripts/rbpi/Install.cmake b/project/cmake/scripts/rbpi/Install.cmake
new file mode 120000
index 0000000..28ce012
--- /dev/null
+++ b/project/cmake/scripts/rbpi/Install.cmake
@@ -0,0 +1 @@
+../linux/Install.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/rbpi/Macros.cmake b/project/cmake/scripts/rbpi/Macros.cmake
new file mode 120000
index 0000000..2fdbb25
--- /dev/null
+++ b/project/cmake/scripts/rbpi/Macros.cmake
@@ -0,0 +1 @@
+../linux/Macros.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/rbpi/PathSetup.cmake b/project/cmake/scripts/rbpi/PathSetup.cmake
new file mode 120000
index 0000000..6786c1c
--- /dev/null
+++ b/project/cmake/scripts/rbpi/PathSetup.cmake
@@ -0,0 +1 @@
+../linux/PathSetup.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/rbpi/archsetup.cmake b/project/cmake/scripts/rbpi/archsetup.cmake
deleted file mode 100644
index 72a610f..0000000
--- a/project/cmake/scripts/rbpi/archsetup.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-if(NOT CMAKE_TOOLCHAIN_FILE)
-  message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE required for rbpi. See ${PROJECT_SOURCE_DIR}/README.md")
-endif()
-
-set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI
-                 -DHAS_OMXPLAYER -DHAVE_OMXLIB)
-set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_FILE_DEFINED
-                   -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64)
-set(PLATFORM_DIR linux)
-
-string(REGEX REPLACE "[ ]+" ";" SYSTEM_LDFLAGS $ENV{LDFLAGS})
-set(CMAKE_SYSTEM_NAME Linux)
-
-if(WITH_ARCH)
-  set(ARCH ${WITH_ARCH})
-else()
-  if(CPU STREQUAL arm1176jzf-s)
-    set(ARCH arm-linux-gnueabihf)
-  elseif(CPU MATCHES "cortex-a7")
-    set(ARCH arm-linux-gnueabihf)
-  else()
-    message(SEND_ERROR "Unknown CPU: ${CPU}")
-  endif()
-endif()
-
-find_package(CXX11 REQUIRED)
-
-set(LIRC_DEVICE "\"/dev/lircd\"" CACHE STRING "LIRC device to use")
-set(DEP_DEFINES -DLIRC_DEVICE=${LIRC_DEVICE})
-set(MMAL_FOUND 1 CACHE INTERNAL "MMAL")
-set(OMX_FOUND 1 CACHE INTERNAL "OMX")
-set(OMXLIB_FOUND 1 CACHE INTERNAL "OMX")
diff --git a/project/cmake/scripts/rbpi/install.cmake b/project/cmake/scripts/rbpi/install.cmake
deleted file mode 120000
index 0409981..0000000
--- a/project/cmake/scripts/rbpi/install.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../linux/install.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/rbpi/macros.cmake b/project/cmake/scripts/rbpi/macros.cmake
deleted file mode 120000
index 28c77ca..0000000
--- a/project/cmake/scripts/rbpi/macros.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../linux/macros.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/rbpi/pathsetup.cmake b/project/cmake/scripts/rbpi/pathsetup.cmake
deleted file mode 120000
index 26d7f17..0000000
--- a/project/cmake/scripts/rbpi/pathsetup.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../linux/pathsetup.cmake
\ No newline at end of file
-- 
cgit v1.2.3