PR #11962 from Nir-Az: Fix building with -DBUILD_EASYLOGGINGPP=OFF

IntelRealSense · Jul 6, 2023 · 7b4adcc · 7b4adcc
2 parents e33b43d + 045a1c2
commit 7b4adcc
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 7 deletions.
diff --git a/.github/workflows/buildsCI.yaml b/.github/workflows/buildsCI.yaml
@@ -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

diff --git a/src/proc/formats-converter.h b/src/proc/formats-converter.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 #include <unordered_set>
+#include <unordered_map>
 #include <memory>
 
 namespace librealsense

diff --git a/src/terminal-parser.cpp b/src/terminal-parser.cpp
@@ -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;
     }
 

diff --git a/third-party/rsutils/src/ensure-console.cpp b/third-party/rsutils/src/ensure-console.cpp
@@ -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