feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Add LD_LIBRARY support

Browse Source 
Extract all the information necessary for the "Add build library search path
to LD_LIBRARY_PATH" from fileapi and enable the relevant UI in the
desktop run configuration.

This allows to remove a workaround introduced for QTCREATORBUG-19354.

Note that this is only supported by fileapi at this time.

Task-number: QTCREATORBUG-23464
Change-Id: I390d26ed8cd559bd7ff8c2701cd3b1cb8e764339
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Tobias Hunger
2020-01-21 14:00:56 +01:00
parent 5a05c78647
commit 2da7d205d4
4 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
View File

@@ -147,6 +147,7 @@ PreprocessedData preprocess(FileApiData &data,
// Simplify to only one configuration:
result.codemodel = extractConfiguration(data.codemodel, errorMessage);
if (!errorMessage.isEmpty()) {
return result;
}
@@ -208,6 +209,8 @@ QList<CMakeBuildTarget> generateBuildTargets(const PreprocessedData &input,
const QList<CMakeBuildTarget> result = transform<QList>(
input.targetDetails, [&sourceDir, &buildDir](const TargetDetails &t) -> CMakeBuildTarget {
const auto currentBuildDir = QDir(buildDir.absoluteFilePath(t.buildDir.toString()));
CMakeBuildTarget ct;
ct.title = t.name;
ct.executable = t.artifacts.isEmpty()
@@ -226,9 +229,9 @@ QList<CMakeBuildTarget> generateBuildTargets(const PreprocessedData &input,
else
type = UtilityType;
ct.targetType = type;
ct.workingDirectory = ct.executable.isEmpty() ? FilePath::fromString(
buildDir.absoluteFilePath(t.buildDir.toString()))
: ct.executable.parentDir();
ct.workingDirectory = ct.executable.isEmpty()
? FilePath::fromString(currentBuildDir.absolutePath())
: ct.executable.parentDir();
ct.sourceDirectory = FilePath::fromString(
QDir::cleanPath(sourceDir.absoluteFilePath(t.sourceDir.toString())));
@@ -258,15 +261,38 @@ QList<CMakeBuildTarget> generateBuildTargets(const PreprocessedData &input,
}
// Is this a terminal application?
Utils::FilePaths librarySeachPaths;
if (ct.targetType == ExecutableType && t.link && t.link.value().language == "CXX") {
for (const FragmentInfo &f : t.link.value().fragments) {
if (f.role != "libraries")
continue;
if (f.fragment.contains("QtGui") || f.fragment.contains("Qt5Gui")
|| f.fragment.contains("Qt6Gui"))
ct.linksToQtGui = true;
FilePath tmp;
// Some projects abuse linking to libraries to pass random flags to the linker!
if (f.role != "flags"
&& !(f.fragment.startsWith("-") || f.fragment.contains(" -"))) {
tmp = FilePath::fromString(currentBuildDir.absoluteFilePath(
QDir::fromNativeSeparators(f.fragment)));
}
if (f.role == "libraries") {
tmp = tmp.parentDir();
if (f.fragment.contains("QtGui") || f.fragment.contains("Qt5Gui")
|| f.fragment.contains("Qt6Gui"))
ct.linksToQtGui = true;
}
if (!tmp.isEmpty()) {
librarySeachPaths.append(tmp);
// Libraries often have their import libs in ../lib and the
// actual dll files in ../bin on windows. Qt is one example of that.
if (tmp.fileName() == "lib" && HostOsInfo::isWindowsHost()) {
const FilePath path = tmp.parentDir().pathAppended("bin");
librarySeachPaths.append(path);
}
}
}
}
ct.libraryDirectories = filteredUnique(librarySeachPaths);
return ct;
});