diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 66a7a2d0..5bfa11b8 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,23 +2,24 @@ // See https://go.microsoft.com/fwlink/?LinkId=733558 // for the documentation about the tasks.json format "version": "2.0.0", + "options": { + }, "tasks": [ { "label": "X86_64 - cmake - domod", "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", "options": { - - "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/", "env": { "BUILD_DIR": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/" } - }, + }, "presentation": { "echo": true, "reveal": "always" - } + }, + "problemMatcher": [] }, { "label": "X86_64 - make - domod", @@ -35,6 +36,38 @@ "problemMatcher": [ "$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" + ] + }, ] } \ No newline at end of file diff --git a/bsp/cmake-modules/toolchain-buildroot.cmake b/bsp/cmake-modules/toolchain-buildroot.cmake index fe414c8a..ae57a299 100644 --- a/bsp/cmake-modules/toolchain-buildroot.cmake +++ b/bsp/cmake-modules/toolchain-buildroot.cmake @@ -7,8 +7,8 @@ SET(CMAKE_SYSTEM_VERSION 1) # specify the cross compiler -SET(CMAKE_C_COMPILER ${SRC_DIR}/_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_C_COMPILER ${workspaceRoot}/_builds/x86_64_domo-debug/cross/usr/bin/x86_64-linux-gcc) +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 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)