From e2a5b5a80fa37e7b6883e9e50e99baa6980d8476 Mon Sep 17 00:00:00 2001 From: romanodanilo Date: Fri, 23 Aug 2024 14:22:05 +0200 Subject: [PATCH 1/8] Update artifact name Signed-off-by: romanodanilo --- .github/workflows/build-on-change-linux-bare.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-on-change-linux-bare.yaml b/.github/workflows/build-on-change-linux-bare.yaml index 996d0394..4c6968d1 100644 --- 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 From cafbd74a6e23383fcf00f88c4d212416a2e76aae Mon Sep 17 00:00:00 2001 From: romanodanilo Date: Fri, 23 Aug 2024 16:55:40 +0200 Subject: [PATCH 2/8] Remove esmini src from installed files Signed-off-by: romanodanilo --- examples/esmini_viewer/CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/examples/esmini_viewer/CMakeLists.txt b/examples/esmini_viewer/CMakeLists.txt index d5b9b451..169383bf 100644 --- a/examples/esmini_viewer/CMakeLists.txt +++ b/examples/esmini_viewer/CMakeLists.txt @@ -26,12 +26,5 @@ install( DESTINATION bin/plugin ) -install( - FILES - esmini_viewer.cpp - DESTINATION - examples/esmini_viewer/src -) - set_target_properties(${VIEWER} PROPERTIES FOLDER examples/viewer) From 9423ad1d07ea6d5bfe540d643dfee507e661a49a Mon Sep 17 00:00:00 2001 From: romanodanilo Date: Fri, 23 Aug 2024 17:05:59 +0200 Subject: [PATCH 3/8] Test esmini build on windows Signed-off-by: romanodanilo --- examples/esmini_viewer/CMakeLists.txt | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/examples/esmini_viewer/CMakeLists.txt b/examples/esmini_viewer/CMakeLists.txt index 169383bf..1c8633d3 100644 --- a/examples/esmini_viewer/CMakeLists.txt +++ b/examples/esmini_viewer/CMakeLists.txt @@ -7,24 +7,31 @@ 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 $<$:stdc++fs>) +add_library(${ESMINI_VIEWER} SHARED esmini_viewer.cpp helper.cpp) +target_link_libraries(${ESMINI_VIEWER} PRIVATE qc4openx-common $<$:stdc++fs>) install( - TARGETS ${VIEWER} + TARGETS ${ESMINI_VIEWER} DESTINATION bin/plugin ) +install( + FILES + esmini_viewer.cpp + DESTINATION + examples/esmini_viewer/src +) + -set_target_properties(${VIEWER} PROPERTIES FOLDER examples/viewer) +set_target_properties(${ESMINI_VIEWER} PROPERTIES FOLDER examples/viewer) From 00962de56e4add0aefc15859cdb002d8108448d8 Mon Sep 17 00:00:00 2001 From: romanodanilo Date: Fri, 23 Aug 2024 17:14:54 +0200 Subject: [PATCH 4/8] Test esmini build on windows Signed-off-by: romanodanilo --- examples/esmini_viewer/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/esmini_viewer/CMakeLists.txt b/examples/esmini_viewer/CMakeLists.txt index 1c8633d3..dceb31cc 100644 --- a/examples/esmini_viewer/CMakeLists.txt +++ b/examples/esmini_viewer/CMakeLists.txt @@ -22,7 +22,7 @@ add_library(${ESMINI_VIEWER} SHARED esmini_viewer.cpp helper.cpp) target_link_libraries(${ESMINI_VIEWER} PRIVATE qc4openx-common $<$:stdc++fs>) install( - TARGETS ${ESMINI_VIEWER} + TARGETS ${CMAKE_CURRENT_BINARY_DIR}/plugin/${ESMINI_VIEWER} DESTINATION bin/plugin ) From 078c3360ad2e7561eefc6489a4d66f8e35f6a667 Mon Sep 17 00:00:00 2001 From: romanodanilo Date: Fri, 23 Aug 2024 17:22:28 +0200 Subject: [PATCH 5/8] Test esmini build on windows Signed-off-by: romanodanilo --- examples/esmini_viewer/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/examples/esmini_viewer/CMakeLists.txt b/examples/esmini_viewer/CMakeLists.txt index dceb31cc..ee2b64c7 100644 --- a/examples/esmini_viewer/CMakeLists.txt +++ b/examples/esmini_viewer/CMakeLists.txt @@ -21,10 +21,19 @@ include_directories(${ESMINI_VIEWER} PRIVATE add_library(${ESMINI_VIEWER} SHARED esmini_viewer.cpp helper.cpp) target_link_libraries(${ESMINI_VIEWER} PRIVATE qc4openx-common $<$:stdc++fs>) +if(WIN32) install( - TARGETS ${CMAKE_CURRENT_BINARY_DIR}/plugin/${ESMINI_VIEWER} + FILES + ${CMAKE_CURRENT_BINARY_DIR}/${ESMINI_VIEWER}.dll + DESTINATION bin/plugin +) +else(WIN32) +install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/lib${ESMINI_VIEWER}.so DESTINATION bin/plugin ) +endif(WIN32) install( FILES From 9bcecd42d62b67845c44f8cdabed4222a1ae58f8 Mon Sep 17 00:00:00 2001 From: romanodanilo Date: Fri, 23 Aug 2024 17:29:59 +0200 Subject: [PATCH 6/8] Test esmini build on windows Signed-off-by: romanodanilo --- examples/esmini_viewer/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/esmini_viewer/CMakeLists.txt b/examples/esmini_viewer/CMakeLists.txt index ee2b64c7..59c01d8c 100644 --- a/examples/esmini_viewer/CMakeLists.txt +++ b/examples/esmini_viewer/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(${ESMINI_VIEWER} PRIVATE qc4openx-common $<$ Date: Fri, 23 Aug 2024 17:40:32 +0200 Subject: [PATCH 7/8] Test esmini build on windows Signed-off-by: romanodanilo --- examples/esmini_viewer/CMakeLists.txt | 11 +---------- examples/esmini_viewer/esmini_viewer.cpp | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/examples/esmini_viewer/CMakeLists.txt b/examples/esmini_viewer/CMakeLists.txt index 59c01d8c..1c8633d3 100644 --- a/examples/esmini_viewer/CMakeLists.txt +++ b/examples/esmini_viewer/CMakeLists.txt @@ -21,19 +21,10 @@ include_directories(${ESMINI_VIEWER} PRIVATE add_library(${ESMINI_VIEWER} SHARED esmini_viewer.cpp helper.cpp) target_link_libraries(${ESMINI_VIEWER} PRIVATE qc4openx-common $<$:stdc++fs>) -if(WIN32) install( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/Release/${ESMINI_VIEWER}.dll - DESTINATION bin/plugin -) -else(WIN32) -install( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/lib${ESMINI_VIEWER}.so + TARGETS ${ESMINI_VIEWER} DESTINATION bin/plugin ) -endif(WIN32) install( FILES diff --git a/examples/esmini_viewer/esmini_viewer.cpp b/examples/esmini_viewer/esmini_viewer.cpp index 04fe4f35..ad22ebaa 100644 --- 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; From d27561677233a3fab97790c8723e3b3f4286d470 Mon Sep 17 00:00:00 2001 From: romanodanilo Date: Fri, 23 Aug 2024 17:51:51 +0200 Subject: [PATCH 8/8] Test esmini build on windows Signed-off-by: romanodanilo --- examples/esmini_viewer/helper.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/esmini_viewer/helper.cpp b/examples/esmini_viewer/helper.cpp index 9d15729c..ee75feed 100644 --- a/examples/esmini_viewer/helper.cpp +++ b/examples/esmini_viewer/helper.cpp @@ -7,6 +7,7 @@ */ #include "helper.h" +#include bool IsExecutableAvailable(const std::string &executable) {