diff options
| author | Aleix Pol <aleixpol@kde.org> | 2017-12-20 20:42:59 +0100 |
|---|---|---|
| committer | Aleix Pol <aleixpol@kde.org> | 2017-12-20 22:35:02 +0100 |
| commit | c91c3650968d828d52291f97f835a5a04024c2e0 (patch) | |
| tree | 7e33c1f3a718d0e9d97d5f6616339c30e20ffc43 /tests/ECMToolchainAndroidTest/testlinkfile | |
| parent | 24134c972e375bebad45c860c413233b60863852 (diff) | |
| download | extra-cmake-modules-c91c3650968d828d52291f97f835a5a04024c2e0.tar.gz extra-cmake-modules-c91c3650968d828d52291f97f835a5a04024c2e0.tar.bz2 | |
Use readelf to find project dependenciesv5.42.0-rc1v5.42.0
Summary:
We were using a link.txt file that cmake used to generate, on newer cmake
versions it doesn't anymore.
Instead use readelf, much like androiddeployqt does, to extract the
depenencies.
Catch: It relies on having all the binaries being at the same subdirectory,
which is the default in ECM since not long ago.
Test Plan: Build kirigamigallery with it
Reviewers: #frameworks, #build_system, aacid
Reviewed By: aacid
Subscribers: mart
Tags: #frameworks, #build_system
Differential Revision: https://phabricator.kde.org/D8173
Diffstat (limited to 'tests/ECMToolchainAndroidTest/testlinkfile')
| -rw-r--r-- | tests/ECMToolchainAndroidTest/testlinkfile/CMakeFiles/testtarget.dir/link.txt | 1 | ||||
| -rw-r--r-- | tests/ECMToolchainAndroidTest/testlinkfile/outputfake.json | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tests/ECMToolchainAndroidTest/testlinkfile/CMakeFiles/testtarget.dir/link.txt b/tests/ECMToolchainAndroidTest/testlinkfile/CMakeFiles/testtarget.dir/link.txt deleted file mode 100644 index 17da75d2..00000000 --- a/tests/ECMToolchainAndroidTest/testlinkfile/CMakeFiles/testtarget.dir/link.txt +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/c++ -pipe -DQT_STRICT_ITERATORS -DQURL_NO_CAST_FROM_STRING -DQT_NO_HTTP -DQT_NO_FTP -Wformat -Werror=format-security -Werror=return-type -Wno-variadic-macros -Wlogical-op -std=c++0x -fno-exceptions -Wall -Wextra -Wcast-align -Wchar-subscripts -Wformat-security -Wno-long-long -Wpointer-arith -Wundef -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type -pedantic -g -Wl,--enable-new-dtags CMakeFiles/persontest.dir/persontest.cpp.o CMakeFiles/persontest.dir/persontest_automoc.cpp.o -o testtarget -rdynamic /opt/qt5/qtbase/lib/libQt5Test.so.5.6.1 ../src/libKF5Attica.so.5.23.0 /opt/qt5/qtbase/lib/libQt5Network.so.5.6.1 /opt/qt5/qtbase/lib/libQt5Core.so.5.6.1 -Wl,-rpath,/opt/qt5/qtbase/lib:/opt/kde/build/frameworks/attica/src diff --git a/tests/ECMToolchainAndroidTest/testlinkfile/outputfake.json b/tests/ECMToolchainAndroidTest/testlinkfile/outputfake.json deleted file mode 100644 index cf482d0c..00000000 --- a/tests/ECMToolchainAndroidTest/testlinkfile/outputfake.json +++ /dev/null @@ -1 +0,0 @@ -##EXTRALIBS## |