Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix building with -DBUILD_EASYLOGGINGPP=OFF #11962

Merged
merged 2 commits into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 42 additions & 1 deletion .github/workflows/buildsCI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,50 @@ jobs:
shell: bash
run: |
cd ${{env.WIN_BUILD_DIR}}
cmake --build . --config ${{env.LRS_RUN_CONFIG}} -- -m
cmake --build . --config ${{env.LRS_RUN_CONFIG}} -- -m

#--------------------------------------------------------------------------------
Win_SH_EX_No_Logs: # Windows, shared, with Examples & Tools, no EasyLogging and no Check for Updates
runs-on: windows-2019
timeout-minutes: 60
steps:
- uses: actions/checkout@v3

- name: Enable Long Paths
shell: powershell
run: |
New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force

- name: Check_API
shell: bash
run: |
cd scripts
./api_check.sh
cd ..

- name: PreBuild
shell: bash
run: |
mkdir ${{env.WIN_BUILD_DIR}}

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
shell: bash
run: |
LRS_SRC_DIR=$(pwd)
cd ${{env.WIN_BUILD_DIR}}
pwd
ls
cmake ${LRS_SRC_DIR} -G "Visual Studio 16 2019" -DBUILD_SHARED_LIBS=true -DBUILD_EXAMPLES=true -DBUILD_TOOLS=true -DCHECK_FOR_UPDATES=false -DBUILD_EASYLOGGINGPP=false

- name: Build
# Build your program with the given configuration
shell: bash
run: |
cd ${{env.WIN_BUILD_DIR}}
cmake --build . --config ${{env.LRS_RUN_CONFIG}} -- -m

#--------------------------------------------------------------------------------
Win_ST_Py_CI: # Windows, Static, Python, Tools, libCI with executables
runs-on: windows-2019
Expand Down
1 change: 1 addition & 0 deletions src/proc/formats-converter.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <vector>
#include <unordered_set>
#include <unordered_map>
#include <memory>

namespace librealsense
Expand Down
6 changes: 0 additions & 6 deletions src/terminal-parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@ namespace librealsense

auto raw_data = build_raw_command_data(command, params);

for (auto b : raw_data)
{
cout << hex << fixed << setfill('0') << setw(2) << (int)b << " ";
}
cout << endl;

return raw_data;
}

Expand Down
1 change: 1 addition & 0 deletions third-party/rsutils/src/ensure-console.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Copyright(c) 2023 Intel Corporation. All Rights Reserved.

#if defined( WIN32 )
#include <iostream>
#include <rsutils/easylogging/easyloggingpp.h>
#include <rsutils/os/hresult.h>
#endif
Expand Down
Loading