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.

Sign up for GitHub

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

Jump to bottom

Update artifact name and fix EsminiViewer build #137

Merged
merged 8 commits into from
Aug 23, 2024
Merged

Update artifact name and fix EsminiViewer build #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e2a5b5a
Update artifact name
romanodanilo Aug 23, 2024
cafbd74
Remove esmini src from installed files
romanodanilo Aug 23, 2024
9423ad1
Test esmini build on windows
romanodanilo Aug 23, 2024
00962de
Test esmini build on windows
romanodanilo Aug 23, 2024
078c336
Test esmini build on windows
romanodanilo Aug 23, 2024
9bcecd4
Test esmini build on windows
romanodanilo Aug 23, 2024
9e5d779
Test esmini build on windows
romanodanilo Aug 23, 2024
d275616
Test esmini build on windows
romanodanilo Aug 23, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build-on-change-linux-bare.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions examples/esmini_viewer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand All @@ -34,4 +34,4 @@ install(
)


set_target_properties(${VIEWER} PROPERTIES FOLDER examples/viewer)
set_target_properties(${ESMINI_VIEWER} PROPERTIES FOLDER examples/viewer)
2 changes: 1 addition & 1 deletion examples/esmini_viewer/esmini_viewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions examples/esmini_viewer/helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

#include "helper.h"
#include <string>

bool IsExecutableAvailable(const std::string &executable)
{
Expand Down
Loading