rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-28 06:24:10 +01:00
Code Issues Releases Activity

LP-535 msys2: use new addCopyDependenciesTarget to automatically find and copy library dependencies

Browse Source
This commit is contained in:
Philippe Renon 2017-06-24 16:12:17 +02:00
parent 5e6b0e83b3
commit bdd95f95f3
2 changed files with 11 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ground/gcs/copydata.pro
View File

@ -87,35 +87,11 @@ win32 {
Qt5MultimediaWidgets$${DS}.dll \
Qt5Quick$${DS}.dll \
Qt5QuickWidgets$${DS}.dll \
Qt5Qml$${DS}.dll \
libicuin57.dll \
libicudt57.dll \
libicuuc57.dll \
libstdc++-6.dll \
libwinpthread-1.dll \
libpcre-1.dll \
libpcre16-0.dll \
zlib1.dll \
libharfbuzz-0.dll \
libgraphite2.dll \
libfreetype-6.dll \
libbz2-1.dll \
libpng16-16.dll \
libjpeg-8.dll \
libglib-2.0-0.dll \
libintl-8.dll \
libiconv-2.dll
contains(QT_ARCH, i386) {
QT_DLLS += \
libgcc_s_dw2-1.dll
} else {
QT_DLLS += \
libgcc_s_seh-1.dll
}
Qt5Qml$${DS}.dll
for(dll, QT_DLLS) {
addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
win32:addCopyDependenciesTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
}
# copy OpenSSL DLLs
@ -141,6 +117,7 @@ win32 {
for(plugin, QT_PLUGINS) {
addCopyFileTarget($${plugin},$$[QT_INSTALL_PLUGINS],$${GCS_QT_PLUGINS_PATH})
win32:addCopyDependenciesTarget($${plugin},$$[QT_INSTALL_PLUGINS],$${GCS_APP_PATH})
}
# Copy QtQuick2 complete directories

50
ground/gcs/src/libs/osgearth/copydata.pro
View File

@ -44,39 +44,7 @@ linux|macx {
}
osg:win32 {
# osg & osgearth dependencies
# curl
OSG_LIBS = \
libcurl-4.dll \
libidn-11.dll \
librtmp-1.dll \
libgmp-10.dll \
libgnutls-30.dll \
libunistring-2.dll \
libp11-kit-0.dll \
libffi-6.dll \
libtasn1-6.dll \
libssh2-1.dll \
libnghttp2-14.dll
equals(OSG_VERSION, "3.5.1") {
OSG_LIBS += \
libhogweed-4-2.dll \
libnettle-6-2.dll
} else {
OSG_LIBS += \
libhogweed-4.dll \
libnettle-6.dll
}
# other
OSG_LIBS += \
libjpeg-8.dll \
libfreetype-6.dll \
libpng16-16.dll \
libiconv-2.dll \
zlib1.dll
# osg and osgearth dependencies
# osg libraries
OSG_LIBS += \
@ -103,6 +71,7 @@ osg:win32 {
for(lib, OSG_LIBS) {
addCopyFileTarget($${lib},$${OSG_SDK_DIR}/bin,$${GCS_APP_PATH})
win32:addCopyDependenciesTarget($${lib},$${OSG_SDK_DIR}/bin,$${GCS_APP_PATH})
}
# osg plugins
@ -183,6 +152,7 @@ osg:win32 {
for(lib, OSG_PLUGINS) {
addCopyFileTarget($${lib},$${OSG_SDK_DIR}/bin/osgPlugins-$${OSG_VERSION},$${GCS_LIBRARY_PATH}/osg/osgPlugins-$${OSG_VERSION})
win32:addCopyDependenciesTarget($${lib},$${OSG_SDK_DIR}/bin/osgPlugins-$${OSG_VERSION},$${GCS_APP_PATH})
}
}
@ -193,23 +163,18 @@ osgearth:win32 {
libosgEarthAnnotation$${DS}.dll \
libosgEarthFeatures$${DS}.dll \
libosgEarthSymbology$${DS}.dll \
libosgEarthUtil$${DS}.dll \
libprotobuf.dll
libosgEarthUtil$${DS}.dll
# gdal
# loaded dynamically (probably by an osg plugin, need to find by which)
OSGEARTH_LIBS += \
libgdal-20.dll \
libgeos_c.dll \
libgeos.dll \
libopenjp2-7.dll \
libtiff-5.dll \
liblzma-5.dll
libopenjp2-7.dll
osgearthQt:OSGEARTH_LIBS += \
libosgEarthQt$${DS}.dll
for(lib, OSGEARTH_LIBS) {
addCopyFileTarget($${lib},$${OSGEARTH_SDK_DIR}/bin,$${GCS_APP_PATH})
win32:addCopyDependenciesTarget($${lib},$${OSGEARTH_SDK_DIR}/bin,$${GCS_APP_PATH})
}
# osgearth plugins
@ -261,5 +226,6 @@ osgearth:win32 {
for(lib, OSGEARTH_PLUGINS) {
addCopyFileTarget($${lib},$${OSGEARTH_SDK_DIR}/bin/osgPlugins-$${OSG_VERSION},$${GCS_LIBRARY_PATH}/osg/osgPlugins-$${OSG_VERSION})
win32:addCopyDependenciesTarget($${lib},$${OSGEARTH_SDK_DIR}/bin/osgPlugins-$${OSG_VERSION},$${GCS_APP_PATH})
}
}