Update artifact name and fix EsminiViewer build (#137)

Signed-off-by: romanodanilo <[email protected]> Signed-off-by: romanodanilo <[email protected]>
asam-ev · Aug 28, 2024 · 09c960a · 09c960a
1 parent 069eef0
commit 09c960a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/build-on-change-linux-bare.yaml b/.github/workflows/build-on-change-linux-bare.yaml
@@ -93,7 +93,7 @@ jobs:
       - name: Upload release artifact
         uses: actions/upload-artifact@v4
         with:
-          name: qc-framework-executables-ubuntu
+          name: qc-framework-executables-linux_x64
           path: artifacts
 
       - name: Unit test execution

diff --git a/examples/esmini_viewer/CMakeLists.txt b/examples/esmini_viewer/CMakeLists.txt
@@ -7,22 +7,22 @@
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # CMake policy CMP0095
 cmake_policy(SET CMP0095 NEW) # RPATH entries are properly escaped in the intermediary CMake install script
 
-set(VIEWER EsminiViewer)
-project(${VIEWER})
+set(ESMINI_VIEWER EsminiViewer)
+project(${ESMINI_VIEWER})
 
 set(CMAKE_INSTALL_RPATH $ORIGIN/../../lib)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS true)
 
-include_directories(${VIEWER} PRIVATE
+include_directories(${ESMINI_VIEWER} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src/report_modules/report_module_gui/src
 )
 
-add_library(${VIEWER} SHARED esmini_viewer.cpp helper.cpp)
-target_link_libraries(${VIEWER} PRIVATE qc4openx-common $<$<PLATFORM_ID:Linux>:stdc++fs>)
+add_library(${ESMINI_VIEWER} SHARED esmini_viewer.cpp helper.cpp)
+target_link_libraries(${ESMINI_VIEWER} PRIVATE qc4openx-common $<$<PLATFORM_ID:Linux>:stdc++fs>)
 
 install(
-    TARGETS ${VIEWER}
+    TARGETS ${ESMINI_VIEWER}
     DESTINATION bin/plugin
 )
 
@@ -34,4 +34,4 @@ install(
 )
 
 
-set_target_properties(${VIEWER} PROPERTIES FOLDER examples/viewer)
+set_target_properties(${ESMINI_VIEWER} PROPERTIES FOLDER examples/viewer)
diff --git a/examples/esmini_viewer/esmini_viewer.cpp b/examples/esmini_viewer/esmini_viewer.cpp
@@ -68,7 +68,7 @@ bool Initialize(const char *inputPath)
     else if (inputFileExtension == "xosc")
     {
         bool result = GetXodrFilePathFromXosc(inputPath, odrToShow);
-        if (not result)
+        if (!result)
         {
             lasterrormsg = "ERROR: Cannot retrieve odr from input xosc";
             return false;

diff --git a/examples/esmini_viewer/helper.cpp b/examples/esmini_viewer/helper.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "helper.h"
+#include <string>
 
 bool IsExecutableAvailable(const std::string &executable)
 {