rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed crossdocker from main tree

Browse Source
This commit is contained in:
Jonas Zeunert
2018-09-13 20:02:40 +02:00
parent 19f3ca4d2a
commit f53d0528f0
4 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
FlippR-Driver/CMakeLists.txt
View File

@@ -8,7 +8,7 @@ set(OUTPUT_PATH bin)
set(LIB_DIR lib) set(LIB_DIR lib)
set(DEFAULT_BUILD_TYPE DEBUG) set(DEFAULT_BUILD_TYPE DEBUG)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 17)
# Boost configuration # Boost configuration
set(BOOST_COMPONENTS program_options thread timer chrono) set(BOOST_COMPONENTS program_options thread timer chrono)
@@ -22,26 +22,27 @@ IF(NOT RPI_ROOT)
ENDIF() ENDIF()
IF(CROSS_COMPILE) IF(CROSS_COMPILE)
SET(CMAKE_CROSSCOMPILING TRUE)
#SET(CMAKE_TOOLCHAIN_FILE ${RPI_ROOT}/Toolchain-RaspberryPi.cmake) #SET(CMAKE_TOOLCHAIN_FILE ${RPI_ROOT}/Toolchain-RaspberryPi.cmake)
SET(CMAKE_SYSTEM_NAME Linux) SET(CMAKE_SYSTEM_NAME Linux)
SET(CMAKE_SYSTEM_VERSION 1) SET(CMAKE_SYSTEM_VERSION 1)
# Specify the cross compiler # Specify the cross compiler
SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc-7) SET(CMAKE_C_COMPILER /usr/bin/clang)
SET(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++-7) SET(CMAKE_CXX_COMPILER /usr/bin/clang)
SET(CMAKE_FIND_ROOT_PATH $ENV{HOME}/raspberrypi/rootfs) # Where is the target environment
SET(CMAKE_FIND_ROOT_PATH ${RPI_ROOT}/rootfs)
# SET(CMAKE_FIND_ROOT_PATH $ENV{HOME}/raspberrypi/rootfs)
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
# SET(Boost_NO_SYSTEM_PATHS TRUE) # SET(Boost_NO_SYSTEM_PATHS TRUE)
# SET(BOOST_ROOT "$ENV{HOME}/boost_1_64_0/") # SET(BOOST_ROOT "$ENV{HOME}/boost_1_64_0/")
# SET(BOOST_INCLUDEDIR "$ENV{HOME}/boost_1_64_0/") # SET(BOOST_INCLUDEDIR "${RPI_ROOT}/rootfs/usr/include//boost_1_64_0/")
# SET(BOOST_LIBRARYDIR "$ENV{HOME}/boost_1_64_0/") # SET(BOOST_LIBRARYDIR "$ENV{HOME}/boost_1_64_0/")
# Where is the target environment
#SET(CMAKE_FIND_ROOT_PATH ${RPI_ROOT}/rootfs)
#SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --sysroot=${CMAKE_FIND_ROOT_PATH}") #SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --sysroot=${CMAKE_FIND_ROOT_PATH}")
#SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --sysroot=${CMAKE_FIND_ROOT_PATH}") #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --sysroot=${CMAKE_FIND_ROOT_PATH}")
#SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --sysroot=${CMAKE_FIND_ROOT_PATH}") #SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} --sysroot=${CMAKE_FIND_ROOT_PATH}")

12
FlippR-Driver/cross-docker/Dockerfile
View File

@@ -1,12 +0,0 @@
FROM ubuntu:latest
RUN apt update \
&& apt install -y git rsync cmake gcc-7-arm-linux-gnueabihf g++-7-arm-linux-gnueabihf
RUN cd ~ \
&& mkdir raspberrypi \
&& cd raspberrypi \
&& mkdir rootfs
COPY lib /root/raspberrypi/rootfs/
COPY usr /root/raspberrypi/rootfs/

3
FlippR-Driver/cross-docker/build-docker.sh
View File

@@ -1,3 +0,0 @@
#! /bin/bash
docker build -t raspberrycross .

3
FlippR-Driver/cross-docker/docker-bash.sh
View File

@@ -1,3 +0,0 @@
#!/bin/bash
docker run -v $(pwd):/root/flippr -it raspberrycross:latest bash