Skip to content

Commit ee25852

Browse files
committed
Various fixes to Linux release compilation/packaging
1 parent 80e96af commit ee25852

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

HopsanGUI/HopsanGUI.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ have_hdf5(){
8181
#--------------------------------------------------------
8282

8383
include($${PWD}/../dependencies/libzip.pri)
84+
include($${PWD}/../dependencies/xerces.pri)
8485

8586
#--------------------------------------------------------
8687
# Set HopsanCore Paths

dependencies/xerces.pri

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ exists($${xerces_dir}) {
2020
} else {
2121
# Note! The RPATH is absolute and only meant for dev builds in the IDE, on release runtime paths should be stripped
2222
unix:QMAKE_RPATHDIR *= $${xerces_dir/bin}
23+
unix:QMAKE_RPATHDIR *= $${xerces_dir/lib}
2324
}
2425
}
2526

packaging/copyInstallHopsan.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,18 @@ srcDeps=${srcDir}/dependencies
8080
install_dir ${srcDeps}/katex $dstDir/dependencies
8181
install_dir ${srcDeps}/fmilibrary $dstDir/dependencies
8282
install_dir ${srcDeps}/fmi4c $dstDir/dependencies
83+
install_dir ${srcDeps}/xerces $dstDir/dependencies
84+
install_dir ${srcDeps}/libzip $dstDir/dependencies
8385

8486
install_dynamic_libs_if_exist ${srcDeps}/qwt/lib libqwt $dstDir/bin
8587
install_dynamic_libs_if_exist ${srcDeps}/zeromq/lib libzmq $dstDir/bin
8688
install_dynamic_libs_if_exist ${srcDeps}/fmilibrary/lib libfmilib_shared $dstDir/bin
8789
install_dynamic_libs_if_exist ${srcDeps}/discount/lib libmarkdown $dstDir/bin
8890
install_dynamic_libs_if_exist ${srcDeps}/hdf5/lib libhdf5 $dstDir/bin
8991
install_dynamic_libs_if_exist ${srcDeps}/hdf5/lib libhdf5_cpp $dstDir/bin
92+
install_dynamic_libs_if_exist ${srcDeps}/xerces/lib libxerces-c $dstDir/bin
93+
install_dynamic_libs_if_exist ${srcDeps}/xerces/lib libxerces-c-3.2 $dstDir/bin
94+
install_dynamic_libs_if_exist ${srcDeps}/libzip/lib libzip $dstDir/bin
9095

9196
# Install additional files
9297
# =====================

packaging/deb/bookworm/debian/rules

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ override_dh_auto_configure:
1616
override_dh_auto_build:
1717
# First build dependencies
1818
packaging/fixPythonShebang.sh ./ 3
19+
cd dependencies; ./setupAsio.sh
1920
cd dependencies; ./setupFMILibrary.sh
2021
cd dependencies; ./setupFmi4c.sh
2122
cd dependencies; ./setupKatex.sh
2223
cd dependencies; ./setupTclap.sh
2324
cd dependencies; ./setupXerces.sh
24-
cd dependencies; ./setupDCPLib.sh
2525
cd dependencies; ./setupLibzip.sh
26-
cd dependencies; ./setupAsio.sh
26+
cd dependencies; ./setupDCPLib.sh
2727

2828
# Now build Hopsan using qmake
2929
mkdir -p hopsanShadowBuild

0 commit comments

Comments
 (0)