Browse Source

Merge branch 'master' into master

master
TheAssassin 7 years ago
committed by GitHub
parent
commit
572bf782a5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      tools/linuxdeployqt/CMakeLists.txt
  2. 2
      tools/linuxdeployqt/shared.cpp

8
tools/linuxdeployqt/CMakeLists.txt

@ -8,6 +8,14 @@ add_definitions("-DBUILD_NUMBER=\"${BUILD_NUMBER}\"")
find_package(Qt5 REQUIRED COMPONENTS Core)
# update excludelist
execute_process(
COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/../excludelist.sh
OUTPUT_VARIABLE EXCLUDELIST
TIMEOUT 10
)
add_executable(linuxdeployqt main.cpp shared.cpp)
target_include_directories(linuxdeployqt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(linuxdeployqt Qt5::Core)
target_compile_definitions(linuxdeployqt PRIVATE -DEXCLUDELIST="${EXCLUDELIST}")

2
tools/linuxdeployqt/shared.cpp

@ -475,7 +475,7 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath,
QStringList excludelist;
#ifndef EXCLUDELIST
excludelist << "ld-linux.so.2" << "ld-linux-x86-64.so.2" << "libanl.so.1" << "libasound.so.2" << "libBrokenLocale.so.1" << "libcidn.so.1" << "libcom_err.so.2" << "libcrypt.so.1" << "libc.so.6" << "libdl.so.2" << "libdrm.so.2" << "libexpat.so.1" << "libfontconfig.so.1" << "libfreetype.so.6" << "libgcc_s.so.1" << "libgdk_pixbuf-2.0.so.0" << "libgio-2.0.so.0" << "libglib-2.0.so.0" << "libGL.so.1" << "libgobject-2.0.so.0" << "libgpg-error.so.0" << "libharfbuzz.so.0" << "libICE.so.6" << "libjack.so.0" << "libkeyutils.so.1" << "libm.so.6" << "libmvec.so.1" << "libnsl.so.1" << "libnss_compat.so.2" << "libnss_db.so.2" << "libnss_dns.so.2" << "libnss_files.so.2" << "libnss_hesiod.so.2" << "libnss_nisplus.so.2" << "libnss_nis.so.2" << "libp11-kit.so.0" << "libpango-1.0.so.0" << "libpangocairo-1.0.so.0" << "libpangoft2-1.0.so.0" << "libpthread.so.0" << "libresolv.so.2" << "librt.so.1" << "libSM.so.6" << "libstdc++.so.6" << "libthread_db.so.1" << "libusb-1.0.so.0" << "libutil.so.1" << "libuuid.so.1" << "libX11.so.6" << "libxcb.so.1" << "libz.so.1";
#error "EXCLUDELIST not defined! Please have your build system download run excludelist.sh and add -DEXCLUDE_LIST=<result>"
#else
excludelist << EXCLUDELIST;
#endif

Loading…
Cancel
Save