rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update build system.

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2018-04-01 23:19:30 +02:00
parent 7a34aaa7be
commit 1a871503be
2 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
.vscode/tasks.json vendored
View File

@@ -2,15 +2,15 @@
// See https://go.microsoft.com/fwlink/?LinkId=733558 // See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format // for the documentation about the tasks.json format
"version": "2.0.0", "version": "2.0.0",
"options": {
},
"tasks": [ "tasks": [
{ {
"label": "X86_64 - cmake - domod", "label": "X86_64 - cmake - domod",
"type": "shell", "type": "shell",
"command": "mkdir -p ${BUILD_DIR}/domo && cd ${BUILD_DIR}/domo && cmake -DSRC_DIR=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake ${workspaceRoot}/src/prog/domod/builders/cmake", "command": "mkdir -p ${BUILD_DIR}/domo && cd ${BUILD_DIR}/domo && cmake -DMODULE_PATH=${workspaceRoot}/bsp/cmake-modules -DworkspaceRoot=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake ${workspaceRoot}/src/prog/domod/builders/cmake",
"group": "build", "group": "build",
"options": { "options": {
"cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/",
"env": { "env": {
"BUILD_DIR": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/" "BUILD_DIR": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/"
} }
@@ -18,7 +18,8 @@
"presentation": { "presentation": {
"echo": true, "echo": true,
"reveal": "always" "reveal": "always"
} },
"problemMatcher": []
}, },
{ {
"label": "X86_64 - make - domod", "label": "X86_64 - make - domod",
@@ -35,6 +36,38 @@
"problemMatcher": [ "problemMatcher": [
"$gcc" "$gcc"
] ]
},
{
"label": "X86_64 - cmake - libubus-cpp",
"type": "shell",
"command": "mkdir -p ${BUILD_DIR}/ubus-cpp && cd ${BUILD_DIR}/ubus-cpp && cmake -DMODULE_PATH=${workspaceRoot}/bsp/cmake-modules -DworkspaceRoot=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake -DCMAKE_INSTALL_PREFIX=${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/ ${workspaceRoot}/src/lib/libubus-cpp/builders/cmake",
"group": "build",
"options": {
"env": {
"BUILD_DIR": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/"
} }
},
"presentation": {
"echo": true,
"reveal": "always"
},
"problemMatcher": []
},
{
"label": "X86_64 - make - libubus-cpp",
"options": {
"cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/ubus-cpp",
},
"type": "shell",
"command": "make install",
"group": "build",
"presentation": {
"echo": true,
"reveal": "always"
},
"problemMatcher": [
"$gcc"
]
},
] ]
} }

4
bsp/cmake-modules/toolchain-buildroot.cmake
View File

@@ -7,8 +7,8 @@ SET(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler # specify the cross compiler
SET(CMAKE_C_COMPILER ${SRC_DIR}/_builds/x86_64_domo-debug/cross/usr/bin/x86_64-linux-gcc) SET(CMAKE_C_COMPILER ${workspaceRoot}/_builds/x86_64_domo-debug/cross/usr/bin/x86_64-linux-gcc)
SET(CMAKE_CXX_COMPILER ${SRC_DIR}/_builds/x86_64_domo-debug/cross/usr/bin/x86_64-linux-g++) SET(CMAKE_CXX_COMPILER ${workspaceRoot}/_builds/x86_64_domo-debug/cross/usr/bin/x86_64-linux-g++)
# search for programs in the build host directories # search for programs in the build host directories
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)