Skip to content

Commit cfd7b84

Browse files
committed
Update ChartDirector linking and improve README formatting
Refactored CMake configuration to link ChartDirector directly by specifying the full .so path, removing the need for a symlink step in the GitHub Actions workflow. Updated README to enhance link and image formatting for better readability.
1 parent fd168b0 commit cfd7b84

File tree

3 files changed

+15
-33
lines changed

3 files changed

+15
-33
lines changed

.github/workflows/build-linux.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ jobs:
4343
restore-keys: |
4444
linux-ccache-
4545
46-
- name: Ensure chartdir symlink exists
47-
run: |
48-
cd vendors/chatdir/linux64
49-
if [ ! -e libchartdir.so ]; then
50-
ln -s libchartdir.so.7.0 libchartdir.so
51-
fi
52-
5346
- name: Configure CMake
5447
run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
5548

CMakeLists.txt

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,10 @@ if(WIN32)
9292
)
9393
elseif(UNIX)
9494
# Linux 64-bit
95-
target_link_directories(PSP-UFU PRIVATE
96-
"${CMAKE_SOURCE_DIR}/vendors/chatdir/linux64"
97-
)
95+
set(CHARTDIR_PATH "${CMAKE_SOURCE_DIR}/vendors/chatdir/linux64")
96+
97+
target_link_directories(PSP-UFU PRIVATE "${CHARTDIR_PATH}")
98+
9899
target_link_libraries(PSP-UFU PRIVATE
99100
wx::core
100101
wx::base
@@ -106,18 +107,12 @@ elseif(UNIX)
106107
wx::xml
107108
wx::stc
108109
fftw3
110+
"${CHARTDIR_PATH}/libchartdir.so.7.0.0"
109111
)
110112

111-
# ChartDirector
112-
target_link_directories(PSP-UFU PRIVATE
113-
"${CMAKE_SOURCE_DIR}/vendors/chatdir/linux64"
114-
)
115-
116-
target_link_libraries(PSP-UFU PRIVATE chartdir)
117-
118113
# RUNTIME PATH to find .so in runtime
119114
set_target_properties(PSP-UFU PROPERTIES
120-
BUILD_RPATH "${CMAKE_SOURCE_DIR}/vendors/chatdir/linux64"
115+
BUILD_RPATH "${CHARTDIR_PATH}"
121116
)
122117
else()
123118
message(FATAL_ERROR "Unsupported platform or architecture")

README.md

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
![PSP-UFU](docs/doxygen/html/logoHeader.png)
1111

12-
<a href="https://thales1330.github.io/PSP/"><strong>PSP-UFU website</strong></a> &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
13-
<a href="https://thales1330.github.io/PSP/docs/"><strong>PSP-UFU user guide</strong></a>
12+
<a href="https://thales1330.github.io/PSP/" style="font-size: 20px;"><strong>Website</strong></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
13+
<a href="https://thales1330.github.io/PSP/docs/" style="font-size: 20px;"><strong>User Guide</strong></a>
1414
</div>
1515

1616

@@ -98,16 +98,10 @@ The executable will be generated at: build/bin/PSP-UFU
9898

9999
## [](#header-2)Overview
100100

101-
![](docs/images/ss_1.png)
102-
103-
![](docs/images/ss_1_1.png)
104-
105-
![](docs/images/ss_1_2.png)
106-
107-
![](docs/images/ss_2.png)
108-
109-
![](docs/images/ss_3.png)
110-
111-
![](docs/images/ss_5.png)
112-
113-
![](docs/images/ss_4.png)
101+
<p align="center">
102+
<img src="docs/images/ss_1.png" width="600"/>
103+
<img src="docs/images/ss_2.png" width="600"/>
104+
<img src="docs/images/ss_3.png" width="600"/>
105+
<img src="docs/images/ss_5.png" width="600"/>
106+
<img src="docs/images/ss_4.png" width="600"/>
107+
</p>

0 commit comments

Comments
 (0)